Remove top-level requires(), stricitfy dorm demo

also, fix some long-standing bugs in dorm.

Author: fredemmott

examples/dorm/CodegenMutator.php

@@ -123,6 +123,7 @@ private function getCreateMethod(): CodegenMethod {
     $cg = $this->codegen;
     // This is a very simple example of generating a method
     return $cg->codegenMethod('create')
+      ->setIsStatic(true)
       ->setReturnType('this')
       ->setBody(
         $cg->codegenHackBuilder()
@@ -135,6 +136,7 @@ private function getUpdateMethod(): CodegenMethod {
     $cg = $this->codegen;
     // This is a very simple example of generating a method
     return $cg->codegenMethod('update')
+      ->setIsStatic(true)
       ->addParameter('int $id')
       ->setReturnType('this')
       ->setBody(

examples/dorm/DormCodegenCLI.hack

@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2015-present, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the MIT license found in the
+ *  LICENSE file in the root directory of this source tree.
+ *
+ */
+
+namespace Facebook\HackCodegen;
+
+use namespace HH\Lib\{C, Vec};
+
+final class DormCodegenCLI extends \Facebook\CLILib\CLIWithRequiredArguments {
+  <<__Override>>
+  public static function getHelpTextForRequiredArguments(): vec<string> {
+    return vec['FILENAME'];
+  }
+
+  <<__Override>>
+  protected function getSupportedOptions(
+  ): vec<\Facebook\CLILib\CLIOptions\CLIOption> { return vec[];
+  }
+
+  <<__Override>>
+  public async function mainAsync(): Awaitable<int> {
+    $fname = C\firstx($this->getArguments());
+    if (!\file_exists($fname)) {
+      await $this->getStderr()
+        ->writeAsync("  File doesn't exist: ".$fname."\n\n");
+      return 1;
+    }
+
+    $classes = \get_declared_classes();
+    require_once($fname);
+    $new_classes = Vec\diff(\get_declared_classes(), $classes);
+
+
+    foreach ($new_classes as $class_name) {
+      $ref = new \ReflectionClass($class_name);
+      if ($ref->isAbstract()) {
+        continue;
+      }
+      $instance = $ref->newInstance() as DormSchema;
+      /* HHAST_IGNORE_ERROR[DontAwaitInALoop] */
+      await $this->getStdout()
+        ->writeAsync("Generating code for ".$class_name."\n");
+      (new CodegenDorm($instance))->generate();
+      (new CodegenMutator($instance))->generate();
+    }
+
+    return 0;
+  }
+}

examples/dorm/codegen.hack

@@ -10,57 +10,10 @@
 
 namespace Facebook\HackCodegen;
 
-use namespace HH\Lib\{C, Vec};
-
-final class DormCodegenCLI extends \Facebook\CLILib\CLIWithRequiredArguments {
-  <<__Override>>
-  public static function getHelpTextForRequiredArguments(): vec<string> {
-    return vec['FILENAME'];
-  }
-
-  <<__Override>>
-  protected function getSupportedOptions(
-  ): vec<\Facebook\CLILib\CLIOptions\CLIOption> {
-    return vec[];
-  }
-
-  <<__Override>>
-  public async function mainAsync(): Awaitable<int> {
-    $fname = C\firstx($this->getArguments());
-    if (!\file_exists($fname)) {
-      await $this->getStderr()
-        ->writeAsync("  File doesn't exist: ".$fname."\n\n");
-      return 1;
-    }
-
-    $classes = \get_declared_classes();
-    require_once($fname);
-    $new_classes = Vec\diff(\get_declared_classes(), $classes);
-
-
-    foreach ($new_classes as $class_name) {
-      $ref = new \ReflectionClass($class_name);
-      if ($ref->isAbstract()) {
-        continue;
-      }
-      $instance = $ref->newInstance() as DormSchema;
-      /* HHAST_IGNORE_ERROR[DontAwaitInALoop] */
-      await $this->getStdout()
-        ->writeAsync("Generating code for ".$class_name."\n");
-      (new CodegenDorm($instance))->generate();
-      (new CodegenMutator($instance))->generate();
-    }
-
-    return 0;
-  }
-}
-
 <<__EntryPoint>>
 async function dorm_codegen_cli_main_async(): Awaitable<noreturn> {
-  (() ==> {
-    // HHAST-generated to avoid pseudomain local leaks
-    require_once(__DIR__.'/../../vendor/hh_autoload.hh');
-  })();
+  require_once(__DIR__.'/../../vendor/autoload.hack');
+  \Facebook\AutoloadMap\initialize();
   $exit_code = await DormCodegenCLI::runAsync();
   exit($exit_code);
 }

examples/dorm/demo/DormUserMutator.php

@@ -6,7 +6,7 @@
  * To re-generate this file run codegen.php DormUserSchema
  *
  *
- * @partially-generated SignedSource<<3eab32bd5832befe294cd6d493ac3953>>
+ * @partially-generated SignedSource<<48c599867b0b679f5bb9cf27d8801e89>>
  */
 
 final class DormUserMutator {
@@ -24,11 +24,11 @@ final class DormUserMutator {
   private function __construct(private ?int $id = null) {
   }
 
-  public function create(): this {
+  public static function create(): this {
     return new DormUserMutator();
   }
 
-  public function update(int $id): this {
+  public static function update(int $id): this {
     return new DormUserMutator($id);
   }
 

examples/dorm/demo/demo_usage.php

@@ -1,4 +1,4 @@
-<?hh // partial
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,46 +10,51 @@
 
 namespace Facebook\HackCodegen;
 
-/* HH_FIXME[1002] HHAST: move to <<__EntryPoint>> function */ require_once('DormUserMutator.php');
-/* HH_FIXME[1002] HHAST: move to <<__EntryPoint>> function */ require_once('DormUser.php');
-
-/**
- * This is to demo how the Dorm classes for User can be used.
- * Notice that before being able to run this, you should set
- * up your DB dsn in DormUserSchema and create the table in
- * your db using, for example:
- *
- * create table user
- * (
- *   user_id integer primary key,
- *   first_name varchar(50) not null,
- *   last_name varchar(50) not null,
- *   birthday date,
- *   country_id integer,
- *   is_active boolean not null
- *  );
- *
- * Before trying this example, you'll need to generate the code by running
- * php codegen.hack demo/DormUserSchema.php.
- */
-$id = DormUserMutator::create()
- ->setFirstName('John')
- ->setLastName('Smith')
- ->setBirthday(new \DateTime('1978-03-26'))
- ->setCountryId(54)
- ->setIsActive(true)
- ->save();
-
-echo "Created user with id ".$id."\n";
-
-$user = DormUser::load($id);
-echo "Loaded: ".$user->getFirstName()." ".$user->getLastName()."\n";
-
-DormUserMutator::update($id)
-  ->setFirstName('Peter')
-  ->save();
-
-echo "Updated the user first name.\n";
-
-$user = DormUser::load($id);
-echo "Loaded: ".$user->getFirstName()." ".$user->getLastName()."\n";
+<<__EntryPoint>>
+function dorm_demo_main(): void {
+  require_once('DormUserMutator.php');
+  require_once('DormUser.php');
+
+  /**
+   * This is to demo how the Dorm classes for User can be used.
+   * Notice that before being able to run this, you should set
+   * up your DB dsn in DormUserSchema and create the table in
+   * your db using, for example:
+   *
+   * create table user
+   * (
+   *   user_id integer primary key,
+   *   first_name varchar(50) not null,
+   *   last_name varchar(50) not null,
+   *   birthday date,
+   *   country_id integer,
+   *   is_active boolean not null
+   *  );
+   *
+   * Before trying this example, you'll need to generate the code by running
+   * php codegen.hack demo/DormUserSchema.php.
+   */
+  $id = \DormUserMutator::create()
+    ->setFirstName('John')
+    ->setLastName('Smith')
+    ->setBirthday(new \DateTime('1978-03-26'))
+    ->setCountryId(54)
+    ->setIsActive(true)
+    ->save();
+
+  echo "Created user with id ".$id."\n";
+
+  $user = \DormUser::load($id);
+  invariant($user is nonnull, 'Failed to load user');
+  echo "Loaded: ".$user->getFirstName()." ".$user->getLastName()."\n";
+
+  \DormUserMutator::update($id)
+    ->setFirstName('Peter')
+    ->save();
+
+  echo "Updated the user first name.\n";
+
+  $user = \DormUser::load($id);
+  invariant($user is nonnull, 'Failed to load user');
+  echo "Loaded: ".$user->getFirstName()." ".$user->getLastName()."\n";
+}