Merge pull request #427 from narumincho/419-reduce-globalthis

419 reduce globalthis

Author: narumincho

README.md

@@ -33,6 +33,7 @@ import * as expr from "jsr:@narumincho/js-ts-code-generator/expr";
 const serverModule: Module = {
   definitionList: [
     exportDefinitionFunction({
+      export: true,
       isAsync: false,
       name: identifierFromString("middleware"),
       document: "ミドルウェア",
@@ -122,7 +123,7 @@ console.log(codeAsString);
 
 ```ts
 /** generated by
- * - https://jsr.io/@narumincho/js-ts-code-generator@0.5.0
+ * - https://jsr.io/@narumincho/js-ts-code-generator@0.6.0
  * Do not edit!
  *
  * @module

collect.ts

@@ -117,7 +117,7 @@ const collectInTypeAlias = (
   );
 
 const collectInFunctionDefinition = (
-  function_: d.Function,
+  function_: d.FunctionDefinition,
   rootScopeIdentifierSet: RootScopeIdentifierSet,
 ): UsedNameAndModulePathSet => {
   const parameterNameSet = new Set(
@@ -163,7 +163,7 @@ const collectInFunctionDefinition = (
 };
 
 const collectInVariableDefinition = (
-  variable: d.Variable,
+  variable: d.VariableDefinition,
   rootScopeIdentifierSet: RootScopeIdentifierSet,
 ): UsedNameAndModulePathSet =>
   concatCollectData(

data.ts

@@ -23,8 +23,8 @@ export type Module = {
 
 export type Definition =
   | { readonly type: "typeAlias"; readonly typeAlias: TypeAlias }
-  | { readonly type: "function"; readonly function: Function }
-  | { readonly type: "variable"; readonly variable: Variable };
+  | { readonly type: "function"; readonly function: FunctionDefinition }
+  | { readonly type: "variable"; readonly variable: VariableDefinition };
 
 /**
  * JavaScript の 文
@@ -62,6 +62,9 @@ export type Statement =
  * TypeAlias. `export type T = {}`
  */
 export type TypeAlias = {
+  /** 外部に公開するか */
+  readonly export: boolean;
+
   /**
    * 名前空間
    */
@@ -87,7 +90,10 @@ export type TypeAlias = {
 /**
  * 外部に公開する関数
  */
-export type Function = {
+export type FunctionDefinition = {
+  /** 外部に公開するか */
+  readonly export: boolean;
+
   readonly isAsync: boolean;
   /**
    * 外部に公開する関数の名前
@@ -160,7 +166,7 @@ export type TsExpr =
     readonly withTypeArguments: WithTypeArguments;
   };
 
-export type Variable = {
+export type VariableDefinition = {
   /**
    * 変数の名前
    */
@@ -177,8 +183,9 @@ export type Variable = {
    * 変数の式
    */
   readonly expr: TsExpr;
-  /** 外部に公開しないか */
-  readonly private?: boolean;
+
+  /** 外部に公開するか */
+  readonly export: boolean;
 };
 
 export type TsType =
@@ -512,6 +519,7 @@ export type KeyValue = {
  * ラムダ式
  */
 export type LambdaExpr = {
+  readonly isAsync: boolean;
   /**
    * パラメーターのリスト
    */

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@narumincho/js-ts-code-generator",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "license": "MIT",
   "exports": {
     ".": "./mod.ts",
@@ -10,6 +10,7 @@
   },
   "compilerOptions": {
     "noUncheckedIndexedAccess": true,
-    "exactOptionalPropertyTypes": true
+    "exactOptionalPropertyTypes": true,
+    "erasableSyntaxOnly": true
   }
 }

identifier.ts

@@ -21,13 +21,12 @@ export const identifierFromString = (word: string): TsIdentifier => {
       : escapeChar(firstChar);
   const slicedWord = word.slice(1);
   for (const char of slicedWord) {
-    result +=
-      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789"
-          .includes(
-            char,
-          )
-        ? char
-        : escapeChar(char);
+    result += "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789"
+        .includes(
+          char,
+        )
+      ? char
+      : escapeChar(char);
   }
   if (reservedByLanguageWordSet.has(word)) {
     return tsIdentifierFromString(result + "_");
@@ -109,6 +108,7 @@ const reservedByLanguageWordSet: ReadonlySet<string> = new Set([
   "top",
   "closed",
   "self",
+  "globalThis",
 ]);
 
 /**

mod.ts

@@ -4,14 +4,14 @@ import {
   type TsIdentifier,
 } from "./identifier.ts";
 import { collectInCode, type UsedNameAndModulePathSet } from "./collect.ts";
-import { toString } from "./toString.ts";
+import { moduleToString } from "./toString.ts";
 import type {
   CodeType,
   Definition,
-  Function,
+  FunctionDefinition,
   Module,
   TypeAlias,
-  Variable,
+  VariableDefinition,
 } from "./data.ts";
 export * from "./identifier.ts";
 export * from "./data.ts";
@@ -38,11 +38,10 @@ export const generateCodeAsString = (
   // グローバル空間にある名前とimportしたモジュールのパスを集める
   const usedNameAndModulePath = collectInCode(code);
 
-  return toString(
+  return moduleToString(
     code,
     {
       moduleMap: createImportedModuleName(usedNameAndModulePath),
-      usedNameSet: usedNameAndModulePath.usedNameSet,
       codeType,
     },
     generatedByLinks,
@@ -73,13 +72,13 @@ const createImportedModuleName = (
 };
 
 export const definitionFunction = (
-  func: Function,
+  func: FunctionDefinition,
 ): Definition => ({ type: "function", function: func });
 
 export const definitionTypeAlias = (
   typeAlias: TypeAlias,
 ): Definition => ({ type: "typeAlias", typeAlias });
 
 export const definitionVariable = (
-  variable: Variable,
+  variable: VariableDefinition,
 ): Definition => ({ type: "variable", variable });

sample.ts

@@ -11,6 +11,7 @@ import * as expr from "./expr.ts";
 const serverModule: Module = {
   definitionList: [
     definitionFunction({
+      export: true,
       isAsync: false,
       name: identifierFromString("middleware"),
       document: "ミドルウェア",

test.ts

@@ -35,6 +35,7 @@ const expressResponse: jsTs.TsType = {
 const sampleCode: jsTs.Module = {
   definitionList: [
     jsTs.definitionFunction({
+      export: true,
       isAsync: false,
       name: identifierFromString("middleware"),
       typeParameterList: [],
@@ -79,6 +80,7 @@ Deno.test("not include revered word", () => {
     code: {
       definitionList: [
         jsTs.definitionFunction({
+          export: true,
           isAsync: false,
           name: identifierFromString("new"),
           document: "newという名前の関数",
@@ -102,6 +104,7 @@ Deno.test("識別子として使えない文字は, 変更される", () => {
     code: {
       definitionList: [
         jsTs.definitionFunction({
+          export: true,
           isAsync: false,
           name: identifierFromString("0name"),
           document: "0から始まる識別子",
@@ -140,6 +143,7 @@ Deno.test("escape string literal", () => {
       {
         type: "variable",
         variable: {
+          export: true,
           name: identifierFromString("stringValue"),
           document: "文字列リテラルでエスケープしているか調べる",
           type: { type: "String" },
@@ -166,6 +170,7 @@ Deno.test("include function parameter name", () => {
   const nodeJsCode: jsTs.Module = {
     definitionList: [
       jsTs.definitionFunction({
+        export: true,
         isAsync: false,
         name: identifierFromString("middleware"),
         document: "ミドルウェア",
@@ -263,6 +268,7 @@ Deno.test("get array index", () => {
     code: {
       definitionList: [
         jsTs.definitionFunction({
+          export: true,
           isAsync: false,
           name: identifierFromString("getZeroIndexElement"),
           document: "Uint8Arrayの0番目の要素を取得する",
@@ -327,6 +333,7 @@ Deno.test("type parameter", () => {
     code: {
       definitionList: [
         jsTs.definitionFunction({
+          export: true,
           isAsync: false,
           name: identifierFromString("sample"),
           document: "",
@@ -407,6 +414,7 @@ Deno.test("object literal return need parenthesis", () => {
     code: {
       definitionList: [
         jsTs.definitionFunction({
+          export: true,
           isAsync: false,
           name: identifierFromString("returnObject"),
           document: "",
@@ -532,6 +540,7 @@ Deno.test("switch", () => {
       {
         type: "typeAlias",
         typeAlias: {
+          export: true,
           name: identifierFromString("Result"),
           document: "Result型",
           namespace: [],
@@ -576,6 +585,7 @@ Deno.test("switch", () => {
         },
       },
       jsTs.definitionFunction({
+        export: true,
         isAsync: false,
         name: identifierFromString("switchSample"),
         document: "switch文のテスト",
@@ -677,6 +687,36 @@ Deno.test("Type Assertion", () => {
     codeType: "TypeScript",
   });
   console.log(codeAsString);
+  assertMatch(codeAsString, /as Date/u);
+});
+
+Deno.test("Type Assertion With globalThis", () => {
+  const code: jsTs.Module = {
+    definitionList: [
+      jsTs.definitionTypeAlias({
+        export: true,
+        name: identifierFromString("Date"),
+        document: "",
+        namespace: [],
+        type: { type: "String" },
+        typeParameterList: [],
+      }),
+    ],
+    statementList: [
+      statement.evaluateExpr({
+        type: "TypeAssertion",
+        typeAssertion: {
+          expr: expr.objectLiteral([]),
+          type: type.Date,
+        },
+      }),
+    ],
+  };
+  const codeAsString = jsTs.generateCodeAsString({
+    code,
+    codeType: "TypeScript",
+  });
+  console.log(codeAsString);
   assertMatch(codeAsString, /as globalThis.Date/u);
 });
 
@@ -686,6 +726,7 @@ Deno.test("Type Intersection", () => {
       {
         type: "typeAlias",
         typeAlias: {
+          export: true,
           name: identifierFromString("SampleIntersectionType"),
           document: "",
           namespace: [],
@@ -707,7 +748,7 @@ Deno.test("Type Intersection", () => {
     codeType: "TypeScript",
   });
   console.log(codeAsString);
-  assertMatch(codeAsString, /globalThis.Date & globalThis.Uint8Array/u);
+  assertMatch(codeAsString, /Date & Uint8Array/u);
 });
 
 Deno.test("object literal spread syntax", () => {
@@ -764,6 +805,7 @@ Deno.test("type property document", () => {
       {
         type: "typeAlias",
         typeAlias: {
+          export: true,
           name: identifierFromString("Time"),
           document: "初期のdefinyで使う時間の内部表現",
           namespace: [],
@@ -842,6 +884,7 @@ Deno.test("output lambda type parameter", () => {
           expr: {
             type: "Lambda",
             lambdaExpr: {
+              isAsync: false,
               parameterList: [
                 {
                   name: identifierFromString("input"),
@@ -894,6 +937,7 @@ Deno.test("output optional type member", () => {
       {
         type: "variable",
         variable: {
+          export: true,
           name: identifierFromString("value"),
           document: "年齢があってもなくてもいいやつ",
           type: type.object([
@@ -930,6 +974,7 @@ Deno.test("read me code", () => {
   const serverCode: jsTs.Module = {
     definitionList: [
       jsTs.definitionFunction({
+        export: true,
         isAsync: false,
         name: identifierFromString("middleware"),
         document: "ミドルウェア",
@@ -1020,7 +1065,7 @@ Deno.test("read me code", () => {
       codeType: "TypeScript",
     }),
     `/** generated by
- * - https://jsr.io/@narumincho/js-ts-code-generator@0.5.0
+ * - https://jsr.io/@narumincho/js-ts-code-generator@0.6.0
  * Do not edit!
  *
  * @module
@@ -1051,6 +1096,7 @@ Deno.test("import name", () => {
       {
         type: "variable",
         variable: {
+          export: true,
           name: identifierFromString("a"),
           document: "a",
           expr: expr.stringLiteral("aaa"),
@@ -1077,7 +1123,7 @@ Deno.test("import name", () => {
   assertEquals(
     codeAsString,
     `/** generated by
- * - https://jsr.io/@narumincho/js-ts-code-generator@0.5.0
+ * - https://jsr.io/@narumincho/js-ts-code-generator@0.6.0
  * Do not edit!
  *
  * @module