jsii-rosetta 5.4.32-dev.4 → 5.5.1-dev.0

package/lib/translate_all.js.map

@@ -1 +1 @@
-{"version":3,"file":"translate_all.js","sourceRoot":"","sources":["../src/translate_all.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,yCAAyC;AAEzC,qCAAqC;AAErC,+CAAsD;AAItD;;;;;;;;;GASG;AACI,KAAK,UAAU,YAAY,CAChC,QAA6B,EAC7B,0BAAmC;IAEnC,6EAA6E;IAC7E,6EAA6E;IAC7E,qDAAqD;IACrD,2FAA2F;IAC3F,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,6BAA6B;QACjD,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC;QACrD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,OAAO,CAAC,IAAI,CAAC,eAAe,UAAU,CAAC,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAE7E,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAyB,CAAC,EAAE;QAC5E,UAAU,EAAE,CAAC;KACd,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,aAAa,CAAC,UAAU,EAAE,0BAA0B,CAAC,CAAC;QAEvE,MAAM,SAAS,GAA6B,MAAM,OAAO,CAAC,GAAG,CAC3D,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAClE,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,KAAK,EAAqB,CAAC;QACnD,MAAM,kBAAkB,GAAG,IAAI,KAAK,EAAqB,CAAC;QAE1D,kBAAkB;QAClB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,WAAW,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC1C,kBAAkB,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,2BAAiB,CAAC,UAAU,CAAC,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;IAC7C,CAAC;YAAS,CAAC;QACT,yBAAyB;QACzB,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;IACxB,CAAC;AACH,CAAC;AAtCD,oCAsCC;AAED,SAAS,aAAa,CACpB,QAA6B,EAC7B,0BAAmC,EACnC,SAAS,GAAG,EAAE;IAEd,MAAM,GAAG,GAAG,EAAE,CAAC;IAEf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;QACpD,GAAG,CAAC,IAAI,CAAC;YACP,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;YAC1C,0BAA0B;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import * as os from 'node:os';\nimport * as path from 'node:path';\nimport * as workerpool from 'workerpool';\n\nimport * as logging from './logging';\nimport { TypeScriptSnippet } from './snippet';\nimport { TranslatedSnippet } from './tablets/tablets';\nimport { RosettaDiagnostic } from './translate';\nimport type { TranslateBatchRequest, TranslateBatchResponse } from './translate_all_worker';\n\n/**\n * Divide the work evenly over all processors by running 'translate_all_worker' in Worker Threads, then combine results\n *\n * The workers are fed small queues of work each. We used to divide the entire queue into N\n * but since the work is divided unevenly that led to some workers stopping early, idling while\n * waiting for more work.\n *\n * Never include 'translate_all_worker' directly, only do TypeScript type references (so that in\n * the script we may assume that 'worker_threads' successfully imports).\n */\nexport async function translateAll(\n  snippets: TypeScriptSnippet[],\n  includeCompilerDiagnostics: boolean,\n): Promise<TranslateAllResult> {\n  // Use about half the advertised cores because hyperthreading doesn't seem to\n  // help that much, or we become I/O-bound at some point. On my machine, using\n  // more than half the cores actually makes it slower.\n  // Cap to a reasonable top-level limit to prevent thrash on machines with many, many cores.\n  const N = process.env.JSII_ROSETTA_MAX_WORKER_COUNT\n    ? parseInt(process.env.JSII_ROSETTA_MAX_WORKER_COUNT)\n    : Math.min(16, Math.max(1, Math.ceil(os.cpus().length / 2)));\n  const snippetArr = Array.from(snippets);\n  logging.info(`Translating ${snippetArr.length} snippets using ${N} workers`);\n\n  const pool = workerpool.pool(path.join(__dirname, 'translate_all_worker.js'), {\n    maxWorkers: N,\n  });\n\n  try {\n    const requests = batchSnippets(snippetArr, includeCompilerDiagnostics);\n\n    const responses: TranslateBatchResponse[] = await Promise.all(\n      requests.map((request) => pool.exec('translateBatch', [request])),\n    );\n\n    const diagnostics = new Array<RosettaDiagnostic>();\n    const translatedSnippets = new Array<TranslatedSnippet>();\n\n    // Combine results\n    for (const response of responses) {\n      diagnostics.push(...response.diagnostics);\n      translatedSnippets.push(...response.translatedSchemas.map(TranslatedSnippet.fromSchema));\n    }\n    return { diagnostics, translatedSnippets };\n  } finally {\n    // Not waiting on purpose\n    void pool.terminate();\n  }\n}\n\nfunction batchSnippets(\n  snippets: TypeScriptSnippet[],\n  includeCompilerDiagnostics: boolean,\n  batchSize = 10,\n): TranslateBatchRequest[] {\n  const ret = [];\n\n  for (let i = 0; i < snippets.length; i += batchSize) {\n    ret.push({\n      snippets: snippets.slice(i, i + batchSize),\n      includeCompilerDiagnostics,\n    });\n  }\n\n  return ret;\n}\n\nexport interface TranslateAllResult {\n  translatedSnippets: TranslatedSnippet[];\n  diagnostics: RosettaDiagnostic[];\n}\n"]}
+{"version":3,"file":"translate_all.js","sourceRoot":"","sources":["../src/translate_all.ts"],"names":[],"mappings":";;AAoBA,oCAsCC;AA1DD,8BAA8B;AAC9B,kCAAkC;AAClC,yCAAyC;AAEzC,qCAAqC;AAErC,+CAAsD;AAItD;;;;;;;;;GASG;AACI,KAAK,UAAU,YAAY,CAChC,QAA6B,EAC7B,0BAAmC;IAEnC,6EAA6E;IAC7E,6EAA6E;IAC7E,qDAAqD;IACrD,2FAA2F;IAC3F,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,6BAA6B;QACjD,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC;QACrD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,OAAO,CAAC,IAAI,CAAC,eAAe,UAAU,CAAC,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAE7E,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAyB,CAAC,EAAE;QAC5E,UAAU,EAAE,CAAC;KACd,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,aAAa,CAAC,UAAU,EAAE,0BAA0B,CAAC,CAAC;QAEvE,MAAM,SAAS,GAA6B,MAAM,OAAO,CAAC,GAAG,CAC3D,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAClE,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,KAAK,EAAqB,CAAC;QACnD,MAAM,kBAAkB,GAAG,IAAI,KAAK,EAAqB,CAAC;QAE1D,kBAAkB;QAClB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,WAAW,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC1C,kBAAkB,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,2BAAiB,CAAC,UAAU,CAAC,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;IAC7C,CAAC;YAAS,CAAC;QACT,yBAAyB;QACzB,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;IACxB,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CACpB,QAA6B,EAC7B,0BAAmC,EACnC,SAAS,GAAG,EAAE;IAEd,MAAM,GAAG,GAAG,EAAE,CAAC;IAEf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;QACpD,GAAG,CAAC,IAAI,CAAC;YACP,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;YAC1C,0BAA0B;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import * as os from 'node:os';\nimport * as path from 'node:path';\nimport * as workerpool from 'workerpool';\n\nimport * as logging from './logging';\nimport { TypeScriptSnippet } from './snippet';\nimport { TranslatedSnippet } from './tablets/tablets';\nimport { RosettaDiagnostic } from './translate';\nimport type { TranslateBatchRequest, TranslateBatchResponse } from './translate_all_worker';\n\n/**\n * Divide the work evenly over all processors by running 'translate_all_worker' in Worker Threads, then combine results\n *\n * The workers are fed small queues of work each. We used to divide the entire queue into N\n * but since the work is divided unevenly that led to some workers stopping early, idling while\n * waiting for more work.\n *\n * Never include 'translate_all_worker' directly, only do TypeScript type references (so that in\n * the script we may assume that 'worker_threads' successfully imports).\n */\nexport async function translateAll(\n  snippets: TypeScriptSnippet[],\n  includeCompilerDiagnostics: boolean,\n): Promise<TranslateAllResult> {\n  // Use about half the advertised cores because hyperthreading doesn't seem to\n  // help that much, or we become I/O-bound at some point. On my machine, using\n  // more than half the cores actually makes it slower.\n  // Cap to a reasonable top-level limit to prevent thrash on machines with many, many cores.\n  const N = process.env.JSII_ROSETTA_MAX_WORKER_COUNT\n    ? parseInt(process.env.JSII_ROSETTA_MAX_WORKER_COUNT)\n    : Math.min(16, Math.max(1, Math.ceil(os.cpus().length / 2)));\n  const snippetArr = Array.from(snippets);\n  logging.info(`Translating ${snippetArr.length} snippets using ${N} workers`);\n\n  const pool = workerpool.pool(path.join(__dirname, 'translate_all_worker.js'), {\n    maxWorkers: N,\n  });\n\n  try {\n    const requests = batchSnippets(snippetArr, includeCompilerDiagnostics);\n\n    const responses: TranslateBatchResponse[] = await Promise.all(\n      requests.map((request) => pool.exec('translateBatch', [request])),\n    );\n\n    const diagnostics = new Array<RosettaDiagnostic>();\n    const translatedSnippets = new Array<TranslatedSnippet>();\n\n    // Combine results\n    for (const response of responses) {\n      diagnostics.push(...response.diagnostics);\n      translatedSnippets.push(...response.translatedSchemas.map(TranslatedSnippet.fromSchema));\n    }\n    return { diagnostics, translatedSnippets };\n  } finally {\n    // Not waiting on purpose\n    void pool.terminate();\n  }\n}\n\nfunction batchSnippets(\n  snippets: TypeScriptSnippet[],\n  includeCompilerDiagnostics: boolean,\n  batchSize = 10,\n): TranslateBatchRequest[] {\n  const ret = [];\n\n  for (let i = 0; i < snippets.length; i += batchSize) {\n    ret.push({\n      snippets: snippets.slice(i, i + batchSize),\n      includeCompilerDiagnostics,\n    });\n  }\n\n  return ret;\n}\n\nexport interface TranslateAllResult {\n  translatedSnippets: TranslatedSnippet[];\n  diagnostics: RosettaDiagnostic[];\n}\n"]}

package/lib/translate_all_worker.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.singleThreadedTranslateAll = void 0;
+exports.singleThreadedTranslateAll = singleThreadedTranslateAll;
 /**
  * Pool worker for extract.ts
  */
@@ -33,6 +33,5 @@ function singleThreadedTranslateAll(snippets, includeCompilerDiagnostics) {
         diagnostics: [...translator.diagnostics, ...failures],
     };
 }
-exports.singleThreadedTranslateAll = singleThreadedTranslateAll;
 workerpool.worker({ translateBatch });
 //# sourceMappingURL=translate_all_worker.js.map

package/lib/translate_all_worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"translate_all_worker.js","sourceRoot":"","sources":["../src/translate_all_worker.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yCAAyC;AAKzC,2CAAmF;AAcnF,SAAS,cAAc,CAAC,OAA8B;IACpD,MAAM,MAAM,GAAG,0BAA0B,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAEhG,OAAO;QACL,iBAAiB,EAAE,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAClE,WAAW,EAAE,MAAM,CAAC,WAAW;KAChC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,0BAA0B,CACxC,QAA6B,EAC7B,0BAAmC;IAEnC,MAAM,kBAAkB,GAAG,IAAI,KAAK,EAAqB,CAAC;IAE1D,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAqB,CAAC;IAEhD,MAAM,UAAU,GAAG,IAAI,sBAAU,CAAC,0BAA0B,CAAC,CAAC;IAC9D,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CACX,IAAA,iCAAqB,EAAC,IAAI,EAAE,uCAAuC,CAAC,KAAK,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,cAAc,EAAE,CAAC,CAC7G,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,kBAAkB;QAClB,WAAW,EAAE,CAAC,GAAG,UAAU,CAAC,WAAW,EAAE,GAAG,QAAQ,CAAC;KACtD,CAAC;AACJ,CAAC;AAvBD,gEAuBC;AAED,UAAU,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC","sourcesContent":["/**\n * Pool worker for extract.ts\n */\nimport * as workerpool from 'workerpool';\n\nimport { TypeScriptSnippet } from './snippet';\nimport { TranslatedSnippetSchema } from './tablets/schema';\nimport { TranslatedSnippet } from './tablets/tablets';\nimport { RosettaDiagnostic, Translator, makeRosettaDiagnostic } from './translate';\nimport { TranslateAllResult } from './translate_all';\n\nexport interface TranslateBatchRequest {\n  readonly snippets: TypeScriptSnippet[];\n  readonly includeCompilerDiagnostics: boolean;\n}\n\nexport interface TranslateBatchResponse {\n  // Cannot be 'TranslatedSnippet' because needs to be serializable\n  readonly translatedSchemas: TranslatedSnippetSchema[];\n  readonly diagnostics: RosettaDiagnostic[];\n}\n\nfunction translateBatch(request: TranslateBatchRequest): TranslateBatchResponse {\n  const result = singleThreadedTranslateAll(request.snippets, request.includeCompilerDiagnostics);\n\n  return {\n    translatedSchemas: result.translatedSnippets.map((s) => s.snippet),\n    diagnostics: result.diagnostics,\n  };\n}\n\n/**\n * Translate the given snippets using a single compiler\n */\nexport function singleThreadedTranslateAll(\n  snippets: TypeScriptSnippet[],\n  includeCompilerDiagnostics: boolean,\n): TranslateAllResult {\n  const translatedSnippets = new Array<TranslatedSnippet>();\n\n  const failures = new Array<RosettaDiagnostic>();\n\n  const translator = new Translator(includeCompilerDiagnostics);\n  for (const block of snippets) {\n    try {\n      translatedSnippets.push(translator.translate(block));\n    } catch (e: any) {\n      failures.push(\n        makeRosettaDiagnostic(true, `rosetta: error translating snippet: ${e}\\n${e.stack}\\n${block.completeSource}`),\n      );\n    }\n  }\n\n  return {\n    translatedSnippets,\n    diagnostics: [...translator.diagnostics, ...failures],\n  };\n}\n\nworkerpool.worker({ translateBatch });\n"]}
+{"version":3,"file":"translate_all_worker.js","sourceRoot":"","sources":["../src/translate_all_worker.ts"],"names":[],"mappings":";;AAkCA,gEAuBC;AAzDD;;GAEG;AACH,yCAAyC;AAKzC,2CAAmF;AAcnF,SAAS,cAAc,CAAC,OAA8B;IACpD,MAAM,MAAM,GAAG,0BAA0B,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAEhG,OAAO;QACL,iBAAiB,EAAE,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAClE,WAAW,EAAE,MAAM,CAAC,WAAW;KAChC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,0BAA0B,CACxC,QAA6B,EAC7B,0BAAmC;IAEnC,MAAM,kBAAkB,GAAG,IAAI,KAAK,EAAqB,CAAC;IAE1D,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAqB,CAAC;IAEhD,MAAM,UAAU,GAAG,IAAI,sBAAU,CAAC,0BAA0B,CAAC,CAAC;IAC9D,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CACX,IAAA,iCAAqB,EAAC,IAAI,EAAE,uCAAuC,CAAC,KAAK,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,cAAc,EAAE,CAAC,CAC7G,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,kBAAkB;QAClB,WAAW,EAAE,CAAC,GAAG,UAAU,CAAC,WAAW,EAAE,GAAG,QAAQ,CAAC;KACtD,CAAC;AACJ,CAAC;AAED,UAAU,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC","sourcesContent":["/**\n * Pool worker for extract.ts\n */\nimport * as workerpool from 'workerpool';\n\nimport { TypeScriptSnippet } from './snippet';\nimport { TranslatedSnippetSchema } from './tablets/schema';\nimport { TranslatedSnippet } from './tablets/tablets';\nimport { RosettaDiagnostic, Translator, makeRosettaDiagnostic } from './translate';\nimport { TranslateAllResult } from './translate_all';\n\nexport interface TranslateBatchRequest {\n  readonly snippets: TypeScriptSnippet[];\n  readonly includeCompilerDiagnostics: boolean;\n}\n\nexport interface TranslateBatchResponse {\n  // Cannot be 'TranslatedSnippet' because needs to be serializable\n  readonly translatedSchemas: TranslatedSnippetSchema[];\n  readonly diagnostics: RosettaDiagnostic[];\n}\n\nfunction translateBatch(request: TranslateBatchRequest): TranslateBatchResponse {\n  const result = singleThreadedTranslateAll(request.snippets, request.includeCompilerDiagnostics);\n\n  return {\n    translatedSchemas: result.translatedSnippets.map((s) => s.snippet),\n    diagnostics: result.diagnostics,\n  };\n}\n\n/**\n * Translate the given snippets using a single compiler\n */\nexport function singleThreadedTranslateAll(\n  snippets: TypeScriptSnippet[],\n  includeCompilerDiagnostics: boolean,\n): TranslateAllResult {\n  const translatedSnippets = new Array<TranslatedSnippet>();\n\n  const failures = new Array<RosettaDiagnostic>();\n\n  const translator = new Translator(includeCompilerDiagnostics);\n  for (const block of snippets) {\n    try {\n      translatedSnippets.push(translator.translate(block));\n    } catch (e: any) {\n      failures.push(\n        makeRosettaDiagnostic(true, `rosetta: error translating snippet: ${e}\\n${e.stack}\\n${block.completeSource}`),\n      );\n    }\n  }\n\n  return {\n    translatedSnippets,\n    diagnostics: [...translator.diagnostics, ...failures],\n  };\n}\n\nworkerpool.worker({ translateBatch });\n"]}

package/lib/typescript/ast-utils.d.ts

@@ -85,7 +85,7 @@ export declare function voidExpressionString(node: ts.VoidExpression): string |
 export declare function extractVoidExpression(node: ts.Node): ts.VoidExpression | undefined;
 export declare function quoteStringLiteral(x: string): string;
 export declare function visibility(x: ts.AccessorDeclaration | ts.FunctionLikeDeclaration | ts.GetAccessorDeclaration | ts.PropertyDeclaration | ts.PropertySignature | ts.SetAccessorDeclaration): "private" | "protected" | "public";
-export declare const isReadOnly: (x: ts.GetAccessorDeclaration | ts.SetAccessorDeclaration | ts.FunctionDeclaration | ts.MethodDeclaration | ts.ConstructorDeclaration | ts.FunctionExpression | ts.ArrowFunction | ts.PropertyDeclaration | ts.PropertySignature) => boolean;
+export declare const isReadOnly: (x: ts.GetAccessorDeclaration | ts.SetAccessorDeclaration | ts.ArrowFunction | ts.ConstructorDeclaration | ts.FunctionDeclaration | ts.FunctionExpression | ts.MethodDeclaration | ts.PropertyDeclaration | ts.PropertySignature) => boolean;
 export declare const isExported: (x: ts.Declaration) => boolean;
 export declare const isPrivate: (x: ts.Declaration) => boolean;
 export declare const isProtected: (x: ts.Declaration) => boolean;

package/lib/typescript/ast-utils.js

@@ -1,6 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findEnclosingClassDeclaration = exports.privatePropertyNames = exports.findSuperCall = exports.isStatic = exports.isPublic = exports.isProtected = exports.isPrivate = exports.isExported = exports.isReadOnly = exports.visibility = exports.quoteStringLiteral = exports.extractVoidExpression = exports.voidExpressionString = exports.extractShowingVoidExpression = exports.extractMaskingVoidExpression = exports.scanText = exports.commentRangeFromTextRange = exports.extractComments = exports.repeatNewlines = exports.countNakedNewlines = exports.matchAst = exports.DONE = exports.allOfType = exports.anyNode = exports.nodeOfType = exports.nodeChildren = exports.stringFromLiteral = exports.stripCommentMarkers = void 0;
+exports.isStatic = exports.isProtected = exports.isPrivate = exports.isExported = exports.isReadOnly = exports.DONE = void 0;
+exports.stripCommentMarkers = stripCommentMarkers;
+exports.stringFromLiteral = stringFromLiteral;
+exports.nodeChildren = nodeChildren;
+exports.nodeOfType = nodeOfType;
+exports.anyNode = anyNode;
+exports.allOfType = allOfType;
+exports.matchAst = matchAst;
+exports.countNakedNewlines = countNakedNewlines;
+exports.repeatNewlines = repeatNewlines;
+exports.extractComments = extractComments;
+exports.commentRangeFromTextRange = commentRangeFromTextRange;
+exports.scanText = scanText;
+exports.extractMaskingVoidExpression = extractMaskingVoidExpression;
+exports.extractShowingVoidExpression = extractShowingVoidExpression;
+exports.voidExpressionString = voidExpressionString;
+exports.extractVoidExpression = extractVoidExpression;
+exports.quoteStringLiteral = quoteStringLiteral;
+exports.visibility = visibility;
+exports.isPublic = isPublic;
+exports.findSuperCall = findSuperCall;
+exports.privatePropertyNames = privatePropertyNames;
+exports.findEnclosingClassDeclaration = findEnclosingClassDeclaration;
 const ts = require("typescript");
 function stripCommentMarkers(comment, multiline) {
     if (multiline) {
@@ -16,14 +38,12 @@ function stripCommentMarkers(comment, multiline) {
     // The text *must* start with '//'
     return comment.replace(/^[/]{2}[ \t]?/gm, '');
 }
-exports.stripCommentMarkers = stripCommentMarkers;
 function stringFromLiteral(expr) {
     if (ts.isStringLiteral(expr)) {
         return expr.text;
     }
     return '???';
 }
-exports.stringFromLiteral = stringFromLiteral;
 /**
  * Return AST children of the given node
  *
@@ -40,7 +60,6 @@ function nodeChildren(node) {
     });
     return ret;
 }
-exports.nodeChildren = nodeChildren;
 // eslint-disable-next-line max-len
 function nodeOfType(syntaxKindOrCaptureName, nodeTypeOrChildren, children) {
     const capturing = typeof syntaxKindOrCaptureName === 'string'; // Determine which overload we're in (SyntaxKind is a number)
@@ -65,7 +84,6 @@ function nodeOfType(syntaxKindOrCaptureName, nodeTypeOrChildren, children) {
         return undefined;
     };
 }
-exports.nodeOfType = nodeOfType;
 function anyNode(children) {
     const realNext = children ?? exports.DONE;
     return (nodes) => {
@@ -78,7 +96,6 @@ function anyNode(children) {
         return undefined;
     };
 }
-exports.anyNode = anyNode;
 // Does not capture deeper because how would we even represent that?
 function allOfType(s, name, children) {
     const realNext = children ?? exports.DONE;
@@ -97,7 +114,6 @@ function allOfType(s, name, children) {
         return ret;
     };
 }
-exports.allOfType = allOfType;
 const DONE = () => ({});
 exports.DONE = DONE;
 function matchAst(node, matcher, cb) {
@@ -110,7 +126,6 @@ function matchAst(node, matcher, cb) {
     }
     return matched;
 }
-exports.matchAst = matchAst;
 /**
  * Count the newlines in a given piece of string that aren't in comment blocks
  */
@@ -134,11 +149,9 @@ function countNakedNewlines(str) {
     }
     return ret;
 }
-exports.countNakedNewlines = countNakedNewlines;
 function repeatNewlines(str) {
     return '\n'.repeat(Math.min(2, countNakedNewlines(str)));
 }
-exports.repeatNewlines = repeatNewlines;
 const WHITESPACE = [' ', '\t', '\r', '\n'];
 /**
  * Extract single-line and multi-line comments from the given string
@@ -150,7 +163,6 @@ function extractComments(text, start) {
         .filter((s) => s.type === 'blockcomment' || s.type === 'linecomment')
         .map(commentRangeFromTextRange);
 }
-exports.extractComments = extractComments;
 function commentRangeFromTextRange(rng) {
     return {
         kind: rng.type === 'blockcomment' ? ts.SyntaxKind.MultiLineCommentTrivia : ts.SyntaxKind.SingleLineCommentTrivia,
@@ -159,7 +171,6 @@ function commentRangeFromTextRange(rng) {
         hasTrailingNewLine: rng.type !== 'blockcomment' && rng.hasTrailingNewLine,
     };
 }
-exports.commentRangeFromTextRange = commentRangeFromTextRange;
 /**
  * Extract spans of comments and non-comments out of the string
  *
@@ -251,7 +262,6 @@ function scanText(text, start, end) {
         return f;
     }
 }
-exports.scanText = scanText;
 const VOID_SHOW_KEYWORD = 'show';
 function extractMaskingVoidExpression(node) {
     const expr = extractVoidExpression(node);
@@ -263,7 +273,6 @@ function extractMaskingVoidExpression(node) {
     }
     return expr;
 }
-exports.extractMaskingVoidExpression = extractMaskingVoidExpression;
 function extractShowingVoidExpression(node) {
     const expr = extractVoidExpression(node);
     if (!expr) {
@@ -274,7 +283,6 @@ function extractShowingVoidExpression(node) {
     }
     return undefined;
 }
-exports.extractShowingVoidExpression = extractShowingVoidExpression;
 /**
  * Return the string argument to a void expression if it exists
  */
@@ -284,7 +292,6 @@ function voidExpressionString(node) {
     }
     return undefined;
 }
-exports.voidExpressionString = voidExpressionString;
 /**
  * We use void directives as pragmas. Extract the void directives here
  */
@@ -303,11 +310,9 @@ function extractVoidExpression(node) {
     }
     return undefined;
 }
-exports.extractVoidExpression = extractVoidExpression;
 function quoteStringLiteral(x) {
     return x.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 }
-exports.quoteStringLiteral = quoteStringLiteral;
 function visibility(x) {
     const flags = ts.getCombinedModifierFlags(x);
     if (flags & ts.ModifierFlags.Private) {
@@ -318,7 +323,6 @@ function visibility(x) {
     }
     return 'public';
 }
-exports.visibility = visibility;
 function hasFlag(flag) {
     return (x) => {
         const flags = ts.getCombinedModifierFlags(x);
@@ -333,7 +337,6 @@ function isPublic(x) {
     // In TypeScript, anything not explicitly marked private or protected is public.
     return !(0, exports.isPrivate)(x) && !(0, exports.isProtected)(x);
 }
-exports.isPublic = isPublic;
 exports.isStatic = hasFlag(ts.ModifierFlags.Static);
 /**
  * Return the super() call from a method body if found
@@ -362,7 +365,6 @@ function findSuperCall(node, renderer) {
     }
     return undefined;
 }
-exports.findSuperCall = findSuperCall;
 /**
  * Return the names of all private property declarations
  */
@@ -370,12 +372,10 @@ function privatePropertyNames(members, renderer) {
     const props = members.filter((m) => ts.isPropertyDeclaration(m));
     return props.filter((m) => visibility(m) === 'private').map((m) => renderer.textOf(m.name));
 }
-exports.privatePropertyNames = privatePropertyNames;
 function findEnclosingClassDeclaration(node) {
     while (node && !ts.isClassDeclaration(node)) {
         node = node.parent;
     }
     return node;
 }
-exports.findEnclosingClassDeclaration = findEnclosingClassDeclaration;
 //# sourceMappingURL=ast-utils.js.map

package/lib/typescript/ast-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../src/typescript/ast-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\n\nimport { AstRenderer } from '../renderer';\n\nexport function stripCommentMarkers(comment: string, multiline: boolean) {\n  if (multiline) {\n    // The text *must* start with '/*' and end with '*/'.\n    // Strip leading '*' from every remaining line (first line because of '**',\n    // other lines because of continuations.\n    return comment\n      .substring(2, comment.length - 2)\n      .replace(/^[ \\t]+/g, '') // Strip all leading whitepace\n      .replace(/[ \\t]+$/g, '') // Strip all trailing whitepace\n      .replace(/^[ \\t]*\\*[ \\t]?/gm, ''); // Strip \"* \" from start of line\n  }\n  // The text *must* start with '//'\n  return comment.replace(/^[/]{2}[ \\t]?/gm, '');\n}\n\nexport function stringFromLiteral(expr: ts.Expression) {\n  if (ts.isStringLiteral(expr)) {\n    return expr.text;\n  }\n  return '???';\n}\n\n/**\n * All types of nodes that can be captured using `nodeOfType`, and the type of Node they map to\n */\nexport type CapturableNodes = {\n  [ts.SyntaxKind.ImportDeclaration]: ts.ImportDeclaration;\n  [ts.SyntaxKind.VariableDeclaration]: ts.VariableDeclaration;\n  [ts.SyntaxKind.ExternalModuleReference]: ts.ExternalModuleReference;\n  [ts.SyntaxKind.NamespaceImport]: ts.NamespaceImport;\n  [ts.SyntaxKind.NamedImports]: ts.NamedImports;\n  [ts.SyntaxKind.ImportSpecifier]: ts.ImportSpecifier;\n  [ts.SyntaxKind.StringLiteral]: ts.StringLiteral;\n};\n\nexport type AstMatcher<A> = (nodes?: ts.Node[]) => A | undefined;\n\n/**\n * Return AST children of the given node\n *\n * Difference with node.getChildren():\n *\n * - node.getChildren() must take a SourceFile (will fail if it doesn't get it)\n *   and returns a mix of abstract and concrete syntax nodes.\n * - This function function will ONLY return abstract syntax nodes.\n */\nexport function nodeChildren(node: ts.Node): ts.Node[] {\n  const ret = new Array<ts.Node>();\n  node.forEachChild((n) => {\n    ret.push(n);\n  });\n  return ret;\n}\n\n/**\n * Match a single node of a given type\n *\n * Capture name is first so that the IDE can detect eagerly that we're falling into\n * that overload and properly autocomplete the recognized node types from CapturableNodes.\n *\n * Looks like SyntaxList nodes appear in the printed AST, but they don't actually appear\n */\nexport function nodeOfType<A>(syntaxKind: ts.SyntaxKind, children?: AstMatcher<A>): AstMatcher<A>;\n// eslint-disable-next-line max-len\nexport function nodeOfType<S extends keyof CapturableNodes, N extends string, A>(\n  capture: N,\n  capturableNodeType: S,\n  children?: AstMatcher<A>,\n): AstMatcher<Omit<A, N> & { [key in N]: CapturableNodes[S] }>;\n// eslint-disable-next-line max-len\nexport function nodeOfType<S extends keyof CapturableNodes, N extends string, A>(\n  syntaxKindOrCaptureName: ts.SyntaxKind | N,\n  nodeTypeOrChildren?: S | AstMatcher<A>,\n  children?: AstMatcher<A>,\n): AstMatcher<A> | AstMatcher<A & { [key in N]: CapturableNodes[S] }> {\n  const capturing = typeof syntaxKindOrCaptureName === 'string'; // Determine which overload we're in (SyntaxKind is a number)\n\n  const realNext = (capturing ? children : (nodeTypeOrChildren as AstMatcher<A>)) ?? DONE;\n  const realCapture = capturing ? syntaxKindOrCaptureName : undefined;\n  const realSyntaxKind = capturing ? nodeTypeOrChildren : syntaxKindOrCaptureName;\n\n  return (nodes) => {\n    for (const node of nodes ?? []) {\n      if (node.kind === realSyntaxKind) {\n        const ret = realNext(nodeChildren(node));\n        if (!ret) {\n          continue;\n        }\n\n        if (realCapture) {\n          return Object.assign(ret, {\n            [realCapture]: node as CapturableNodes[S],\n          }) as any;\n        }\n        return ret;\n      }\n    }\n    return undefined;\n  };\n}\n\nexport function anyNode(): AstMatcher<Record<string, unknown>>;\nexport function anyNode<A>(children: AstMatcher<A>): AstMatcher<A>;\nexport function anyNode<A>(children?: AstMatcher<A>): AstMatcher<A> | AstMatcher<any> {\n  const realNext = children ?? DONE;\n  return (nodes) => {\n    for (const node of nodes ?? []) {\n      const m = realNext(nodeChildren(node));\n      if (m) {\n        return m;\n      }\n    }\n    return undefined;\n  };\n}\n\n// Does not capture deeper because how would we even represent that?\nexport function allOfType<S extends keyof CapturableNodes, N extends string, A>(\n  s: S,\n  name: N,\n  children?: AstMatcher<A>,\n): AstMatcher<{ [key in N]: Array<CapturableNodes[S]> }> {\n  type ArrayType = Array<CapturableNodes[S]>;\n  type ReturnType = { [key in N]: ArrayType };\n  const realNext = children ?? DONE;\n\n  return (nodes) => {\n    let ret: ReturnType | undefined;\n    for (const node of nodes ?? []) {\n      if (node.kind === s) {\n        if (realNext(nodeChildren(node))) {\n          if (!ret) {\n            ret = { [name]: new Array<CapturableNodes[S]>() } as ReturnType;\n          }\n          ret[name].push(node as any);\n        }\n      }\n    }\n    return ret;\n  };\n}\n\nexport const DONE: AstMatcher<Record<string, unknown>> = () => ({});\n\n/**\n * Run a matcher against a node and return (or invoke a callback with) the accumulated bindings\n */\nexport function matchAst<A>(node: ts.Node, matcher: AstMatcher<A>): A | undefined;\nexport function matchAst<A>(node: ts.Node, matcher: AstMatcher<A>, cb: (bindings: A) => void): boolean;\nexport function matchAst<A>(\n  node: ts.Node,\n  matcher: AstMatcher<A>,\n  cb?: (bindings: A) => void,\n): boolean | A | undefined {\n  const matched = matcher([node]);\n  if (cb) {\n    if (matched) {\n      cb(matched);\n    }\n    return !!matched;\n  }\n  return matched;\n}\n\n/**\n * Count the newlines in a given piece of string that aren't in comment blocks\n */\nexport function countNakedNewlines(str: string) {\n  let ret = 0;\n  for (const s of scanText(str, 0, str.length).filter((r) => r.type === 'other' || r.type === 'blockcomment')) {\n    if (s.type === 'other') {\n      // Count newlines in non-comments\n      for (let i = s.pos; i < s.end; i++) {\n        if (str[i] === '\\n') {\n          ret++;\n        }\n      }\n    } else {\n      // Discount newlines at the end of block comments\n      if (s.hasTrailingNewLine) {\n        ret--;\n      }\n    }\n  }\n  return ret;\n}\n\nexport function repeatNewlines(str: string) {\n  return '\\n'.repeat(Math.min(2, countNakedNewlines(str)));\n}\n\nconst WHITESPACE = [' ', '\\t', '\\r', '\\n'];\n\n/**\n * Extract single-line and multi-line comments from the given string\n *\n * Rewritten because I can't get ts.getLeadingComments and ts.getTrailingComments to do what I want.\n */\nexport function extractComments(text: string, start: number): ts.CommentRange[] {\n  return scanText(text, start)\n    .filter((s) => s.type === 'blockcomment' || s.type === 'linecomment')\n    .map(commentRangeFromTextRange);\n}\n\nexport function commentRangeFromTextRange(rng: TextRange): ts.CommentRange {\n  return {\n    kind: rng.type === 'blockcomment' ? ts.SyntaxKind.MultiLineCommentTrivia : ts.SyntaxKind.SingleLineCommentTrivia,\n    pos: rng.pos,\n    end: rng.end,\n    hasTrailingNewLine: rng.type !== 'blockcomment' && rng.hasTrailingNewLine,\n  };\n}\n\ninterface TextRange {\n  pos: number;\n  end: number;\n  type: 'linecomment' | 'blockcomment' | 'other' | 'directive';\n  hasTrailingNewLine: boolean;\n}\n\n/**\n * Extract spans of comments and non-comments out of the string\n *\n * Stop at 'end' when given, or the first non-whitespace character in a\n * non-comment if not given.\n */\nexport function scanText(text: string, start: number, end?: number): TextRange[] {\n  const ret: TextRange[] = [];\n\n  let pos = start;\n  const stopAtCode = end === undefined;\n  if (end === undefined) {\n    end = text.length;\n  }\n  while (pos < end) {\n    const ch = text[pos];\n\n    if (WHITESPACE.includes(ch)) {\n      pos++;\n      continue;\n    }\n\n    if (ch === '/' && text[pos + 1] === '/') {\n      accumulateTextBlock();\n      scanSinglelineComment();\n      continue;\n    }\n\n    if (ch === '/' && text[pos + 1] === '*') {\n      accumulateTextBlock();\n      scanMultilineComment();\n      continue;\n    }\n\n    // Non-whitespace, non-comment, must be regular token. End if we're not scanning\n    // to a particular location, otherwise continue.\n    if (stopAtCode) {\n      break;\n    }\n\n    pos++;\n  }\n\n  accumulateTextBlock();\n\n  return ret;\n\n  function scanMultilineComment() {\n    const endOfComment = findNext('*/', pos + 2);\n    ret.push({\n      type: 'blockcomment',\n      hasTrailingNewLine: ['\\n', '\\r'].includes(text[endOfComment + 2]),\n      pos,\n      end: endOfComment + 2,\n    });\n    pos = endOfComment + 2;\n    start = pos;\n  }\n\n  function scanSinglelineComment() {\n    const nl = Math.min(findNext('\\r', pos + 2), findNext('\\n', pos + 2));\n\n    if (text[pos + 2] === '/') {\n      // Special /// comment\n      ret.push({\n        type: 'directive',\n        hasTrailingNewLine: true,\n        pos: pos + 1,\n        end: nl,\n      });\n    } else {\n      // Regular // comment\n      ret.push({\n        type: 'linecomment',\n        hasTrailingNewLine: true,\n        pos,\n        end: nl,\n      });\n    }\n    pos = nl + 1;\n    start = pos;\n  }\n\n  function accumulateTextBlock() {\n    if (pos - start > 0) {\n      ret.push({\n        type: 'other',\n        hasTrailingNewLine: false,\n        pos: start,\n        end: pos,\n      });\n      start = pos;\n    }\n  }\n\n  function findNext(sub: string, startPos: number) {\n    const f = text.indexOf(sub, startPos);\n    if (f === -1) {\n      return text.length;\n    }\n    return f;\n  }\n}\n\nconst VOID_SHOW_KEYWORD = 'show';\n\nexport function extractMaskingVoidExpression(node: ts.Node): ts.VoidExpression | undefined {\n  const expr = extractVoidExpression(node);\n  if (!expr) {\n    return undefined;\n  }\n  if (ts.isStringLiteral(expr.expression) && expr.expression.text === VOID_SHOW_KEYWORD) {\n    return undefined;\n  }\n  return expr;\n}\n\nexport function extractShowingVoidExpression(node: ts.Node): ts.VoidExpression | undefined {\n  const expr = extractVoidExpression(node);\n  if (!expr) {\n    return undefined;\n  }\n  if (ts.isStringLiteral(expr.expression) && expr.expression.text === VOID_SHOW_KEYWORD) {\n    return expr;\n  }\n  return undefined;\n}\n\n/**\n * Return the string argument to a void expression if it exists\n */\nexport function voidExpressionString(node: ts.VoidExpression): string | undefined {\n  if (ts.isStringLiteral(node.expression)) {\n    return node.expression.text;\n  }\n  return undefined;\n}\n\n/**\n * We use void directives as pragmas. Extract the void directives here\n */\nexport function extractVoidExpression(node: ts.Node): ts.VoidExpression | undefined {\n  if (ts.isVoidExpression(node)) {\n    return node;\n  }\n  if (ts.isExpressionStatement(node)) {\n    return extractVoidExpression(node.expression);\n  }\n  if (ts.isParenthesizedExpression(node)) {\n    return extractVoidExpression(node.expression);\n  }\n  if (ts.isBinaryExpression(node) && node.operatorToken.kind === ts.SyntaxKind.CommaToken) {\n    return extractVoidExpression(node.left);\n  }\n  return undefined;\n}\n\nexport function quoteStringLiteral(x: string) {\n  return x.replace(/\\\\/g, '\\\\\\\\').replace(/\"/g, '\\\\\"');\n}\n\nexport function visibility(\n  x:\n    | ts.AccessorDeclaration\n    | ts.FunctionLikeDeclaration\n    | ts.GetAccessorDeclaration\n    | ts.PropertyDeclaration\n    | ts.PropertySignature\n    | ts.SetAccessorDeclaration,\n) {\n  const flags = ts.getCombinedModifierFlags(x);\n  if (flags & ts.ModifierFlags.Private) {\n    return 'private';\n  }\n  if (flags & ts.ModifierFlags.Protected) {\n    return 'protected';\n  }\n  return 'public';\n}\n\nfunction hasFlag<T extends ts.Declaration>(flag: ts.ModifierFlags) {\n  return (x: T) => {\n    const flags = ts.getCombinedModifierFlags(x);\n    return (flags & flag) !== 0;\n  };\n}\n\nexport const isReadOnly = hasFlag<\n  | ts.AccessorDeclaration\n  | ts.FunctionLikeDeclaration\n  | ts.GetAccessorDeclaration\n  | ts.PropertyDeclaration\n  | ts.PropertySignature\n  | ts.SetAccessorDeclaration\n>(ts.ModifierFlags.Readonly);\nexport const isExported = hasFlag(ts.ModifierFlags.Export);\nexport const isPrivate = hasFlag(ts.ModifierFlags.Private);\nexport const isProtected = hasFlag(ts.ModifierFlags.Private);\nexport function isPublic(x: ts.Declaration) {\n  // In TypeScript, anything not explicitly marked private or protected is public.\n  return !isPrivate(x) && !isProtected(x);\n}\nexport const isStatic = hasFlag(ts.ModifierFlags.Static);\n\n/**\n * Return the super() call from a method body if found\n */\nexport function findSuperCall(\n  node: ts.Block | ts.Expression | undefined,\n  renderer: AstRenderer<any>,\n): ts.SuperCall | undefined {\n  if (node === undefined) {\n    return undefined;\n  }\n  if (ts.isCallExpression(node)) {\n    if (renderer.textOf(node.expression) === 'super') {\n      return node as unknown as ts.SuperCall;\n    }\n  }\n  if (ts.isExpressionStatement(node)) {\n    return findSuperCall(node.expression, renderer);\n  }\n  if (ts.isBlock(node)) {\n    for (const statement of node.statements) {\n      if (ts.isExpressionStatement(statement)) {\n        const s = findSuperCall(statement.expression, renderer);\n        if (s) {\n          return s;\n        }\n      }\n    }\n  }\n  return undefined;\n}\n\n/**\n * Return the names of all private property declarations\n */\nexport function privatePropertyNames(members: readonly ts.ClassElement[], renderer: AstRenderer<any>): string[] {\n  const props = members.filter((m) => ts.isPropertyDeclaration(m)) as ts.PropertyDeclaration[];\n  return props.filter((m) => visibility(m) === 'private').map((m) => renderer.textOf(m.name));\n}\n\nexport function findEnclosingClassDeclaration(node: ts.Node): ts.ClassDeclaration | undefined {\n  while (node && !ts.isClassDeclaration(node)) {\n    node = node.parent;\n  }\n  return node;\n}\n"]}
+{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../src/typescript/ast-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\n\nimport { AstRenderer } from '../renderer';\n\nexport function stripCommentMarkers(comment: string, multiline: boolean) {\n  if (multiline) {\n    // The text *must* start with '/*' and end with '*/'.\n    // Strip leading '*' from every remaining line (first line because of '**',\n    // other lines because of continuations.\n    return comment\n      .substring(2, comment.length - 2)\n      .replace(/^[ \\t]+/g, '') // Strip all leading whitepace\n      .replace(/[ \\t]+$/g, '') // Strip all trailing whitepace\n      .replace(/^[ \\t]*\\*[ \\t]?/gm, ''); // Strip \"* \" from start of line\n  }\n  // The text *must* start with '//'\n  return comment.replace(/^[/]{2}[ \\t]?/gm, '');\n}\n\nexport function stringFromLiteral(expr: ts.Expression) {\n  if (ts.isStringLiteral(expr)) {\n    return expr.text;\n  }\n  return '???';\n}\n\n/**\n * All types of nodes that can be captured using `nodeOfType`, and the type of Node they map to\n */\nexport type CapturableNodes = {\n  [ts.SyntaxKind.ImportDeclaration]: ts.ImportDeclaration;\n  [ts.SyntaxKind.VariableDeclaration]: ts.VariableDeclaration;\n  [ts.SyntaxKind.ExternalModuleReference]: ts.ExternalModuleReference;\n  [ts.SyntaxKind.NamespaceImport]: ts.NamespaceImport;\n  [ts.SyntaxKind.NamedImports]: ts.NamedImports;\n  [ts.SyntaxKind.ImportSpecifier]: ts.ImportSpecifier;\n  [ts.SyntaxKind.StringLiteral]: ts.StringLiteral;\n};\n\nexport type AstMatcher<A> = (nodes?: ts.Node[]) => A | undefined;\n\n/**\n * Return AST children of the given node\n *\n * Difference with node.getChildren():\n *\n * - node.getChildren() must take a SourceFile (will fail if it doesn't get it)\n *   and returns a mix of abstract and concrete syntax nodes.\n * - This function function will ONLY return abstract syntax nodes.\n */\nexport function nodeChildren(node: ts.Node): ts.Node[] {\n  const ret = new Array<ts.Node>();\n  node.forEachChild((n) => {\n    ret.push(n);\n  });\n  return ret;\n}\n\n/**\n * Match a single node of a given type\n *\n * Capture name is first so that the IDE can detect eagerly that we're falling into\n * that overload and properly autocomplete the recognized node types from CapturableNodes.\n *\n * Looks like SyntaxList nodes appear in the printed AST, but they don't actually appear\n */\nexport function nodeOfType<A>(syntaxKind: ts.SyntaxKind, children?: AstMatcher<A>): AstMatcher<A>;\n// eslint-disable-next-line max-len\nexport function nodeOfType<S extends keyof CapturableNodes, N extends string, A>(\n  capture: N,\n  capturableNodeType: S,\n  children?: AstMatcher<A>,\n): AstMatcher<Omit<A, N> & { [key in N]: CapturableNodes[S] }>;\n// eslint-disable-next-line max-len\nexport function nodeOfType<S extends keyof CapturableNodes, N extends string, A>(\n  syntaxKindOrCaptureName: ts.SyntaxKind | N,\n  nodeTypeOrChildren?: S | AstMatcher<A>,\n  children?: AstMatcher<A>,\n): AstMatcher<A> | AstMatcher<A & { [key in N]: CapturableNodes[S] }> {\n  const capturing = typeof syntaxKindOrCaptureName === 'string'; // Determine which overload we're in (SyntaxKind is a number)\n\n  const realNext = (capturing ? children : (nodeTypeOrChildren as AstMatcher<A>)) ?? DONE;\n  const realCapture = capturing ? syntaxKindOrCaptureName : undefined;\n  const realSyntaxKind = capturing ? nodeTypeOrChildren : syntaxKindOrCaptureName;\n\n  return (nodes) => {\n    for (const node of nodes ?? []) {\n      if (node.kind === realSyntaxKind) {\n        const ret = realNext(nodeChildren(node));\n        if (!ret) {\n          continue;\n        }\n\n        if (realCapture) {\n          return Object.assign(ret, {\n            [realCapture]: node as CapturableNodes[S],\n          }) as any;\n        }\n        return ret;\n      }\n    }\n    return undefined;\n  };\n}\n\nexport function anyNode(): AstMatcher<Record<string, unknown>>;\nexport function anyNode<A>(children: AstMatcher<A>): AstMatcher<A>;\nexport function anyNode<A>(children?: AstMatcher<A>): AstMatcher<A> | AstMatcher<any> {\n  const realNext = children ?? DONE;\n  return (nodes) => {\n    for (const node of nodes ?? []) {\n      const m = realNext(nodeChildren(node));\n      if (m) {\n        return m;\n      }\n    }\n    return undefined;\n  };\n}\n\n// Does not capture deeper because how would we even represent that?\nexport function allOfType<S extends keyof CapturableNodes, N extends string, A>(\n  s: S,\n  name: N,\n  children?: AstMatcher<A>,\n): AstMatcher<{ [key in N]: Array<CapturableNodes[S]> }> {\n  type ArrayType = Array<CapturableNodes[S]>;\n  type ReturnType = { [key in N]: ArrayType };\n  const realNext = children ?? DONE;\n\n  return (nodes) => {\n    let ret: ReturnType | undefined;\n    for (const node of nodes ?? []) {\n      if (node.kind === s) {\n        if (realNext(nodeChildren(node))) {\n          if (!ret) {\n            ret = { [name]: new Array<CapturableNodes[S]>() } as ReturnType;\n          }\n          ret[name].push(node as any);\n        }\n      }\n    }\n    return ret;\n  };\n}\n\nexport const DONE: AstMatcher<Record<string, unknown>> = () => ({});\n\n/**\n * Run a matcher against a node and return (or invoke a callback with) the accumulated bindings\n */\nexport function matchAst<A>(node: ts.Node, matcher: AstMatcher<A>): A | undefined;\nexport function matchAst<A>(node: ts.Node, matcher: AstMatcher<A>, cb: (bindings: A) => void): boolean;\nexport function matchAst<A>(\n  node: ts.Node,\n  matcher: AstMatcher<A>,\n  cb?: (bindings: A) => void,\n): boolean | A | undefined {\n  const matched = matcher([node]);\n  if (cb) {\n    if (matched) {\n      cb(matched);\n    }\n    return !!matched;\n  }\n  return matched;\n}\n\n/**\n * Count the newlines in a given piece of string that aren't in comment blocks\n */\nexport function countNakedNewlines(str: string) {\n  let ret = 0;\n  for (const s of scanText(str, 0, str.length).filter((r) => r.type === 'other' || r.type === 'blockcomment')) {\n    if (s.type === 'other') {\n      // Count newlines in non-comments\n      for (let i = s.pos; i < s.end; i++) {\n        if (str[i] === '\\n') {\n          ret++;\n        }\n      }\n    } else {\n      // Discount newlines at the end of block comments\n      if (s.hasTrailingNewLine) {\n        ret--;\n      }\n    }\n  }\n  return ret;\n}\n\nexport function repeatNewlines(str: string) {\n  return '\\n'.repeat(Math.min(2, countNakedNewlines(str)));\n}\n\nconst WHITESPACE = [' ', '\\t', '\\r', '\\n'];\n\n/**\n * Extract single-line and multi-line comments from the given string\n *\n * Rewritten because I can't get ts.getLeadingComments and ts.getTrailingComments to do what I want.\n */\nexport function extractComments(text: string, start: number): ts.CommentRange[] {\n  return scanText(text, start)\n    .filter((s) => s.type === 'blockcomment' || s.type === 'linecomment')\n    .map(commentRangeFromTextRange);\n}\n\nexport function commentRangeFromTextRange(rng: TextRange): ts.CommentRange {\n  return {\n    kind: rng.type === 'blockcomment' ? ts.SyntaxKind.MultiLineCommentTrivia : ts.SyntaxKind.SingleLineCommentTrivia,\n    pos: rng.pos,\n    end: rng.end,\n    hasTrailingNewLine: rng.type !== 'blockcomment' && rng.hasTrailingNewLine,\n  };\n}\n\ninterface TextRange {\n  pos: number;\n  end: number;\n  type: 'linecomment' | 'blockcomment' | 'other' | 'directive';\n  hasTrailingNewLine: boolean;\n}\n\n/**\n * Extract spans of comments and non-comments out of the string\n *\n * Stop at 'end' when given, or the first non-whitespace character in a\n * non-comment if not given.\n */\nexport function scanText(text: string, start: number, end?: number): TextRange[] {\n  const ret: TextRange[] = [];\n\n  let pos = start;\n  const stopAtCode = end === undefined;\n  if (end === undefined) {\n    end = text.length;\n  }\n  while (pos < end) {\n    const ch = text[pos];\n\n    if (WHITESPACE.includes(ch)) {\n      pos++;\n      continue;\n    }\n\n    if (ch === '/' && text[pos + 1] === '/') {\n      accumulateTextBlock();\n      scanSinglelineComment();\n      continue;\n    }\n\n    if (ch === '/' && text[pos + 1] === '*') {\n      accumulateTextBlock();\n      scanMultilineComment();\n      continue;\n    }\n\n    // Non-whitespace, non-comment, must be regular token. End if we're not scanning\n    // to a particular location, otherwise continue.\n    if (stopAtCode) {\n      break;\n    }\n\n    pos++;\n  }\n\n  accumulateTextBlock();\n\n  return ret;\n\n  function scanMultilineComment() {\n    const endOfComment = findNext('*/', pos + 2);\n    ret.push({\n      type: 'blockcomment',\n      hasTrailingNewLine: ['\\n', '\\r'].includes(text[endOfComment + 2]),\n      pos,\n      end: endOfComment + 2,\n    });\n    pos = endOfComment + 2;\n    start = pos;\n  }\n\n  function scanSinglelineComment() {\n    const nl = Math.min(findNext('\\r', pos + 2), findNext('\\n', pos + 2));\n\n    if (text[pos + 2] === '/') {\n      // Special /// comment\n      ret.push({\n        type: 'directive',\n        hasTrailingNewLine: true,\n        pos: pos + 1,\n        end: nl,\n      });\n    } else {\n      // Regular // comment\n      ret.push({\n        type: 'linecomment',\n        hasTrailingNewLine: true,\n        pos,\n        end: nl,\n      });\n    }\n    pos = nl + 1;\n    start = pos;\n  }\n\n  function accumulateTextBlock() {\n    if (pos - start > 0) {\n      ret.push({\n        type: 'other',\n        hasTrailingNewLine: false,\n        pos: start,\n        end: pos,\n      });\n      start = pos;\n    }\n  }\n\n  function findNext(sub: string, startPos: number) {\n    const f = text.indexOf(sub, startPos);\n    if (f === -1) {\n      return text.length;\n    }\n    return f;\n  }\n}\n\nconst VOID_SHOW_KEYWORD = 'show';\n\nexport function extractMaskingVoidExpression(node: ts.Node): ts.VoidExpression | undefined {\n  const expr = extractVoidExpression(node);\n  if (!expr) {\n    return undefined;\n  }\n  if (ts.isStringLiteral(expr.expression) && expr.expression.text === VOID_SHOW_KEYWORD) {\n    return undefined;\n  }\n  return expr;\n}\n\nexport function extractShowingVoidExpression(node: ts.Node): ts.VoidExpression | undefined {\n  const expr = extractVoidExpression(node);\n  if (!expr) {\n    return undefined;\n  }\n  if (ts.isStringLiteral(expr.expression) && expr.expression.text === VOID_SHOW_KEYWORD) {\n    return expr;\n  }\n  return undefined;\n}\n\n/**\n * Return the string argument to a void expression if it exists\n */\nexport function voidExpressionString(node: ts.VoidExpression): string | undefined {\n  if (ts.isStringLiteral(node.expression)) {\n    return node.expression.text;\n  }\n  return undefined;\n}\n\n/**\n * We use void directives as pragmas. Extract the void directives here\n */\nexport function extractVoidExpression(node: ts.Node): ts.VoidExpression | undefined {\n  if (ts.isVoidExpression(node)) {\n    return node;\n  }\n  if (ts.isExpressionStatement(node)) {\n    return extractVoidExpression(node.expression);\n  }\n  if (ts.isParenthesizedExpression(node)) {\n    return extractVoidExpression(node.expression);\n  }\n  if (ts.isBinaryExpression(node) && node.operatorToken.kind === ts.SyntaxKind.CommaToken) {\n    return extractVoidExpression(node.left);\n  }\n  return undefined;\n}\n\nexport function quoteStringLiteral(x: string) {\n  return x.replace(/\\\\/g, '\\\\\\\\').replace(/\"/g, '\\\\\"');\n}\n\nexport function visibility(\n  x:\n    | ts.AccessorDeclaration\n    | ts.FunctionLikeDeclaration\n    | ts.GetAccessorDeclaration\n    | ts.PropertyDeclaration\n    | ts.PropertySignature\n    | ts.SetAccessorDeclaration,\n) {\n  const flags = ts.getCombinedModifierFlags(x);\n  if (flags & ts.ModifierFlags.Private) {\n    return 'private';\n  }\n  if (flags & ts.ModifierFlags.Protected) {\n    return 'protected';\n  }\n  return 'public';\n}\n\nfunction hasFlag<T extends ts.Declaration>(flag: ts.ModifierFlags) {\n  return (x: T) => {\n    const flags = ts.getCombinedModifierFlags(x);\n    return (flags & flag) !== 0;\n  };\n}\n\nexport const isReadOnly = hasFlag<\n  | ts.AccessorDeclaration\n  | ts.FunctionLikeDeclaration\n  | ts.GetAccessorDeclaration\n  | ts.PropertyDeclaration\n  | ts.PropertySignature\n  | ts.SetAccessorDeclaration\n>(ts.ModifierFlags.Readonly);\nexport const isExported = hasFlag(ts.ModifierFlags.Export);\nexport const isPrivate = hasFlag(ts.ModifierFlags.Private);\nexport const isProtected = hasFlag(ts.ModifierFlags.Private);\nexport function isPublic(x: ts.Declaration) {\n  // In TypeScript, anything not explicitly marked private or protected is public.\n  return !isPrivate(x) && !isProtected(x);\n}\nexport const isStatic = hasFlag(ts.ModifierFlags.Static);\n\n/**\n * Return the super() call from a method body if found\n */\nexport function findSuperCall(\n  node: ts.Block | ts.Expression | undefined,\n  renderer: AstRenderer<any>,\n): ts.SuperCall | undefined {\n  if (node === undefined) {\n    return undefined;\n  }\n  if (ts.isCallExpression(node)) {\n    if (renderer.textOf(node.expression) === 'super') {\n      return node as unknown as ts.SuperCall;\n    }\n  }\n  if (ts.isExpressionStatement(node)) {\n    return findSuperCall(node.expression, renderer);\n  }\n  if (ts.isBlock(node)) {\n    for (const statement of node.statements) {\n      if (ts.isExpressionStatement(statement)) {\n        const s = findSuperCall(statement.expression, renderer);\n        if (s) {\n          return s;\n        }\n      }\n    }\n  }\n  return undefined;\n}\n\n/**\n * Return the names of all private property declarations\n */\nexport function privatePropertyNames(members: readonly ts.ClassElement[], renderer: AstRenderer<any>): string[] {\n  const props = members.filter((m) => ts.isPropertyDeclaration(m)) as ts.PropertyDeclaration[];\n  return props.filter((m) => visibility(m) === 'private').map((m) => renderer.textOf(m.name));\n}\n\nexport function findEnclosingClassDeclaration(node: ts.Node): ts.ClassDeclaration | undefined {\n  while (node && !ts.isClassDeclaration(node)) {\n    node = node.parent;\n  }\n  return node;\n}\n"]}

package/lib/typescript/imports.d.ts

@@ -37,6 +37,6 @@ export interface ImportBinding {
     readonly importedSymbol?: JsiiSymbol;
 }
 export declare function analyzeImportEquals(node: ts.ImportEqualsDeclaration, context: AstRenderer<any>): ImportStatement;
-export declare function analyzeImportDeclaration(node: ts.ImportDeclaration, context: AstRenderer<any>): ImportStatement;
-export declare function analyzeImportDeclaration(node: ts.ImportDeclaration, context: AstRenderer<any>, submoduleReferences: SubmoduleReferenceMap): ImportStatement[];
+export declare function analyzeImportDeclaration(node: ts.ImportDeclaration | ts.JSDocImportTag, context: AstRenderer<any>): ImportStatement;
+export declare function analyzeImportDeclaration(node: ts.ImportDeclaration | ts.JSDocImportTag, context: AstRenderer<any>, submoduleReferences: SubmoduleReferenceMap): ImportStatement[];
 //# sourceMappingURL=imports.d.ts.map

package/lib/typescript/imports.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.analyzeImportDeclaration = exports.analyzeImportEquals = void 0;
+exports.analyzeImportEquals = analyzeImportEquals;
+exports.analyzeImportDeclaration = analyzeImportDeclaration;
 const ts = require("typescript");
 const ast_utils_1 = require("./ast-utils");
 const jsii_utils_1 = require("../jsii/jsii-utils");
@@ -18,7 +19,6 @@ function analyzeImportEquals(node, context) {
         imports: { import: 'full', alias: sourceName, sourceName },
     };
 }
-exports.analyzeImportEquals = analyzeImportEquals;
 function analyzeImportDeclaration(node, context, submoduleReferences) {
     const packageName = (0, ast_utils_1.stringFromLiteral)(node.moduleSpecifier);
     const starBindings = (0, ast_utils_1.matchAst)(node, (0, ast_utils_1.nodeOfType)(ts.SyntaxKind.ImportDeclaration, (0, ast_utils_1.nodeOfType)(ts.SyntaxKind.ImportClause, (0, ast_utils_1.nodeOfType)('namespace', ts.SyntaxKind.NamespaceImport))));
@@ -128,5 +128,4 @@ function analyzeImportDeclaration(node, context, submoduleReferences) {
         ...extraImports,
     ];
 }
-exports.analyzeImportDeclaration = analyzeImportDeclaration;
 //# sourceMappingURL=imports.js.map

package/lib/typescript/imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/typescript/imports.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\n\nimport { allOfType, matchAst, nodeOfType, stringFromLiteral } from './ast-utils';\nimport { JsiiSymbol, parentSymbol, lookupJsiiSymbolFromNode } from '../jsii/jsii-utils';\nimport { AstRenderer } from '../renderer';\nimport { SubmoduleReferenceMap } from '../submodule-reference';\nimport { fmap } from '../util';\n\n/**\n * Our own unification of import statements\n */\nexport interface ImportStatement {\n  readonly node: ts.Node;\n  readonly packageName: string;\n  readonly imports: FullImport | SelectiveImport;\n  readonly moduleSymbol?: JsiiSymbol;\n}\n\nexport type FullImport = {\n  readonly import: 'full';\n  /**\n   * The name of the namespace prefix in the source code. Used to strip the\n   * prefix in certain languages (e.g: Java).\n   */\n  readonly sourceName: string;\n  /**\n   * The name under which this module is imported. Undefined if the module is\n   * not aliased (could be the case for namepsace/submodule imports).\n   */\n  readonly alias?: string;\n};\n\nexport type SelectiveImport = {\n  readonly import: 'selective';\n  readonly elements: ImportBinding[];\n};\n\nexport interface ImportBinding {\n  readonly sourceName: string;\n\n  readonly alias?: string;\n\n  /**\n   * The JSII Symbol the import refers to\n   */\n  readonly importedSymbol?: JsiiSymbol;\n}\n\nexport function analyzeImportEquals(node: ts.ImportEqualsDeclaration, context: AstRenderer<any>): ImportStatement {\n  let moduleName = '???';\n  matchAst(node.moduleReference, nodeOfType('ref', ts.SyntaxKind.ExternalModuleReference), (bindings) => {\n    moduleName = stringFromLiteral(bindings.ref.expression);\n  });\n\n  const sourceName = context.textOf(node.name);\n\n  return {\n    node,\n    packageName: moduleName,\n    moduleSymbol: lookupJsiiSymbolFromNode(context.typeChecker, node.name),\n    imports: { import: 'full', alias: sourceName, sourceName },\n  };\n}\n\nexport function analyzeImportDeclaration(node: ts.ImportDeclaration, context: AstRenderer<any>): ImportStatement;\nexport function analyzeImportDeclaration(\n  node: ts.ImportDeclaration,\n  context: AstRenderer<any>,\n  submoduleReferences: SubmoduleReferenceMap,\n): ImportStatement[];\nexport function analyzeImportDeclaration(\n  node: ts.ImportDeclaration,\n  context: AstRenderer<any>,\n  submoduleReferences?: SubmoduleReferenceMap,\n): ImportStatement | ImportStatement[] {\n  const packageName = stringFromLiteral(node.moduleSpecifier);\n\n  const starBindings = matchAst(\n    node,\n    nodeOfType(\n      ts.SyntaxKind.ImportDeclaration,\n      nodeOfType(ts.SyntaxKind.ImportClause, nodeOfType('namespace', ts.SyntaxKind.NamespaceImport)),\n    ),\n  );\n\n  if (starBindings) {\n    const sourceName = context.textOf(starBindings.namespace.name);\n    const bareImport: ImportStatement = {\n      node,\n      packageName,\n      moduleSymbol: lookupJsiiSymbolFromNode(context.typeChecker, starBindings.namespace.name),\n      imports: {\n        import: 'full',\n        alias: sourceName,\n        sourceName,\n      },\n    };\n    if (submoduleReferences == null) {\n      return bareImport;\n    }\n\n    const rootSymbol = context.typeChecker.getSymbolAtLocation(starBindings.namespace.name);\n    const refs = rootSymbol && Array.from(submoduleReferences.values()).filter((ref) => ref.root === rootSymbol);\n    // No submodule reference, or only 1 where the path is empty (this is used to signal the use of the bare import so it's not erased)\n    if (refs == null || refs.length === 0 || (refs.length === 1 && refs[0].path.length === 0)) {\n      return [bareImport];\n    }\n\n    return refs.flatMap(({ lastNode, path, root, submoduleChain }, idx, array): ImportStatement[] => {\n      if (\n        array\n          .slice(0, idx)\n          .some(\n            (other) => other.root === root && context.textOf(other.submoduleChain) === context.textOf(submoduleChain),\n          )\n      ) {\n        // This would be a duplicate, so we're skipping it\n        return [];\n      }\n\n      const moduleSymbol = lookupJsiiSymbolFromNode(context.typeChecker, lastNode);\n      return [\n        {\n          node,\n          packageName: [packageName, ...path.map((n) => context.textOf(n))].join('/'),\n          moduleSymbol,\n          imports: {\n            import: 'full',\n            alias: undefined, // No alias exists in the source text for this...\n            sourceName: context.textOf(submoduleChain),\n          },\n        },\n      ];\n    });\n  }\n\n  const namedBindings = matchAst(\n    node,\n    nodeOfType(\n      ts.SyntaxKind.ImportDeclaration,\n      nodeOfType(\n        ts.SyntaxKind.ImportClause,\n        nodeOfType(ts.SyntaxKind.NamedImports, allOfType(ts.SyntaxKind.ImportSpecifier, 'specifiers')),\n      ),\n    ),\n  );\n\n  const extraImports = new Array<ImportStatement>();\n  const elements: ImportBinding[] = (namedBindings?.specifiers ?? []).flatMap(\n    ({ name, propertyName }): ImportBinding[] => {\n      // regular import { name }\n      // renamed import { propertyName as name }\n      const directBinding = {\n        sourceName: context.textOf(propertyName ?? name),\n        alias: propertyName && context.textOf(name),\n        importedSymbol: lookupJsiiSymbolFromNode(context.typeChecker, propertyName ?? name),\n      } as const;\n\n      if (submoduleReferences != null) {\n        const symbol = context.typeChecker.getSymbolAtLocation(name);\n        let omitDirectBinding = false;\n        for (const match of Array.from(submoduleReferences.values()).filter((ref) => ref.root === symbol)) {\n          if (match.path.length === 0) {\n            // This is a namespace binding that is used as-is (not via a transitive path). It needs to be preserved.\n            omitDirectBinding = false;\n            continue;\n          }\n          const subPackageName = [packageName, ...match.path.map((n) => n.getText(n.getSourceFile()))].join('/');\n          const importedSymbol = lookupJsiiSymbolFromNode(context.typeChecker, match.lastNode);\n          const moduleSymbol = fmap(importedSymbol, parentSymbol);\n          const importStatement =\n            extraImports.find((stmt) => {\n              if (moduleSymbol != null) {\n                return stmt.moduleSymbol === moduleSymbol;\n              }\n              return stmt.packageName === subPackageName;\n            }) ??\n            extraImports[\n              extraImports.push({\n                moduleSymbol,\n                node: match.lastNode,\n                packageName: subPackageName,\n                imports: { import: 'selective', elements: [] },\n              }) - 1\n            ];\n\n          (importStatement.imports as SelectiveImport).elements.push({\n            sourceName: context.textOf(match.submoduleChain),\n            importedSymbol,\n          });\n        }\n        if (omitDirectBinding) {\n          return [];\n        }\n      }\n\n      return [directBinding];\n    },\n  );\n\n  if (submoduleReferences == null) {\n    return {\n      node,\n      packageName,\n      imports: { import: 'selective', elements },\n      moduleSymbol: fmap(elements?.[0]?.importedSymbol, parentSymbol),\n    };\n  }\n\n  return [\n    {\n      node,\n      packageName,\n      imports: { import: 'selective', elements },\n      moduleSymbol: fmap(elements?.[0]?.importedSymbol, parentSymbol),\n    },\n    ...extraImports,\n  ];\n}\n"]}
+{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/typescript/imports.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\n\nimport { allOfType, matchAst, nodeOfType, stringFromLiteral } from './ast-utils';\nimport { JsiiSymbol, parentSymbol, lookupJsiiSymbolFromNode } from '../jsii/jsii-utils';\nimport { AstRenderer } from '../renderer';\nimport { SubmoduleReferenceMap } from '../submodule-reference';\nimport { fmap } from '../util';\n\n/**\n * Our own unification of import statements\n */\nexport interface ImportStatement {\n  readonly node: ts.Node;\n  readonly packageName: string;\n  readonly imports: FullImport | SelectiveImport;\n  readonly moduleSymbol?: JsiiSymbol;\n}\n\nexport type FullImport = {\n  readonly import: 'full';\n  /**\n   * The name of the namespace prefix in the source code. Used to strip the\n   * prefix in certain languages (e.g: Java).\n   */\n  readonly sourceName: string;\n  /**\n   * The name under which this module is imported. Undefined if the module is\n   * not aliased (could be the case for namepsace/submodule imports).\n   */\n  readonly alias?: string;\n};\n\nexport type SelectiveImport = {\n  readonly import: 'selective';\n  readonly elements: ImportBinding[];\n};\n\nexport interface ImportBinding {\n  readonly sourceName: string;\n\n  readonly alias?: string;\n\n  /**\n   * The JSII Symbol the import refers to\n   */\n  readonly importedSymbol?: JsiiSymbol;\n}\n\nexport function analyzeImportEquals(node: ts.ImportEqualsDeclaration, context: AstRenderer<any>): ImportStatement {\n  let moduleName = '???';\n  matchAst(node.moduleReference, nodeOfType('ref', ts.SyntaxKind.ExternalModuleReference), (bindings) => {\n    moduleName = stringFromLiteral(bindings.ref.expression);\n  });\n\n  const sourceName = context.textOf(node.name);\n\n  return {\n    node,\n    packageName: moduleName,\n    moduleSymbol: lookupJsiiSymbolFromNode(context.typeChecker, node.name),\n    imports: { import: 'full', alias: sourceName, sourceName },\n  };\n}\n\nexport function analyzeImportDeclaration(\n  node: ts.ImportDeclaration | ts.JSDocImportTag,\n  context: AstRenderer<any>,\n): ImportStatement;\nexport function analyzeImportDeclaration(\n  node: ts.ImportDeclaration | ts.JSDocImportTag,\n  context: AstRenderer<any>,\n  submoduleReferences: SubmoduleReferenceMap,\n): ImportStatement[];\nexport function analyzeImportDeclaration(\n  node: ts.ImportDeclaration | ts.JSDocImportTag,\n  context: AstRenderer<any>,\n  submoduleReferences?: SubmoduleReferenceMap,\n): ImportStatement | ImportStatement[] {\n  const packageName = stringFromLiteral(node.moduleSpecifier);\n\n  const starBindings = matchAst(\n    node,\n    nodeOfType(\n      ts.SyntaxKind.ImportDeclaration,\n      nodeOfType(ts.SyntaxKind.ImportClause, nodeOfType('namespace', ts.SyntaxKind.NamespaceImport)),\n    ),\n  );\n\n  if (starBindings) {\n    const sourceName = context.textOf(starBindings.namespace.name);\n    const bareImport: ImportStatement = {\n      node,\n      packageName,\n      moduleSymbol: lookupJsiiSymbolFromNode(context.typeChecker, starBindings.namespace.name),\n      imports: {\n        import: 'full',\n        alias: sourceName,\n        sourceName,\n      },\n    };\n    if (submoduleReferences == null) {\n      return bareImport;\n    }\n\n    const rootSymbol = context.typeChecker.getSymbolAtLocation(starBindings.namespace.name);\n    const refs = rootSymbol && Array.from(submoduleReferences.values()).filter((ref) => ref.root === rootSymbol);\n    // No submodule reference, or only 1 where the path is empty (this is used to signal the use of the bare import so it's not erased)\n    if (refs == null || refs.length === 0 || (refs.length === 1 && refs[0].path.length === 0)) {\n      return [bareImport];\n    }\n\n    return refs.flatMap(({ lastNode, path, root, submoduleChain }, idx, array): ImportStatement[] => {\n      if (\n        array\n          .slice(0, idx)\n          .some(\n            (other) => other.root === root && context.textOf(other.submoduleChain) === context.textOf(submoduleChain),\n          )\n      ) {\n        // This would be a duplicate, so we're skipping it\n        return [];\n      }\n\n      const moduleSymbol = lookupJsiiSymbolFromNode(context.typeChecker, lastNode);\n      return [\n        {\n          node,\n          packageName: [packageName, ...path.map((n) => context.textOf(n))].join('/'),\n          moduleSymbol,\n          imports: {\n            import: 'full',\n            alias: undefined, // No alias exists in the source text for this...\n            sourceName: context.textOf(submoduleChain),\n          },\n        },\n      ];\n    });\n  }\n\n  const namedBindings = matchAst(\n    node,\n    nodeOfType(\n      ts.SyntaxKind.ImportDeclaration,\n      nodeOfType(\n        ts.SyntaxKind.ImportClause,\n        nodeOfType(ts.SyntaxKind.NamedImports, allOfType(ts.SyntaxKind.ImportSpecifier, 'specifiers')),\n      ),\n    ),\n  );\n\n  const extraImports = new Array<ImportStatement>();\n  const elements: ImportBinding[] = (namedBindings?.specifiers ?? []).flatMap(\n    ({ name, propertyName }): ImportBinding[] => {\n      // regular import { name }\n      // renamed import { propertyName as name }\n      const directBinding = {\n        sourceName: context.textOf(propertyName ?? name),\n        alias: propertyName && context.textOf(name),\n        importedSymbol: lookupJsiiSymbolFromNode(context.typeChecker, propertyName ?? name),\n      } as const;\n\n      if (submoduleReferences != null) {\n        const symbol = context.typeChecker.getSymbolAtLocation(name);\n        let omitDirectBinding = false;\n        for (const match of Array.from(submoduleReferences.values()).filter((ref) => ref.root === symbol)) {\n          if (match.path.length === 0) {\n            // This is a namespace binding that is used as-is (not via a transitive path). It needs to be preserved.\n            omitDirectBinding = false;\n            continue;\n          }\n          const subPackageName = [packageName, ...match.path.map((n) => n.getText(n.getSourceFile()))].join('/');\n          const importedSymbol = lookupJsiiSymbolFromNode(context.typeChecker, match.lastNode);\n          const moduleSymbol = fmap(importedSymbol, parentSymbol);\n          const importStatement =\n            extraImports.find((stmt) => {\n              if (moduleSymbol != null) {\n                return stmt.moduleSymbol === moduleSymbol;\n              }\n              return stmt.packageName === subPackageName;\n            }) ??\n            extraImports[\n              extraImports.push({\n                moduleSymbol,\n                node: match.lastNode,\n                packageName: subPackageName,\n                imports: { import: 'selective', elements: [] },\n              }) - 1\n            ];\n\n          (importStatement.imports as SelectiveImport).elements.push({\n            sourceName: context.textOf(match.submoduleChain),\n            importedSymbol,\n          });\n        }\n        if (omitDirectBinding) {\n          return [];\n        }\n      }\n\n      return [directBinding];\n    },\n  );\n\n  if (submoduleReferences == null) {\n    return {\n      node,\n      packageName,\n      imports: { import: 'selective', elements },\n      moduleSymbol: fmap(elements?.[0]?.importedSymbol, parentSymbol),\n    };\n  }\n\n  return [\n    {\n      node,\n      packageName,\n      imports: { import: 'selective', elements },\n      moduleSymbol: fmap(elements?.[0]?.importedSymbol, parentSymbol),\n    },\n    ...extraImports,\n  ];\n}\n"]}

package/lib/typescript/types.js

@@ -1,6 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.determineReturnType = exports.renderFlags = exports.isStaticReadonlyAccess = exports.isEnumAccess = exports.isNumber = exports.inferredTypeOfExpression = exports.typeOfExpression = exports.arrayElementType = exports.inferMapElementType = exports.mapElementType = exports.renderTypeFlags = exports.typeContainsUndefined = exports.parameterAcceptsUndefined = exports.renderType = exports.builtInTypeName = exports.firstTypeInUnion = void 0;
+exports.firstTypeInUnion = firstTypeInUnion;
+exports.builtInTypeName = builtInTypeName;
+exports.renderType = renderType;
+exports.parameterAcceptsUndefined = parameterAcceptsUndefined;
+exports.typeContainsUndefined = typeContainsUndefined;
+exports.renderTypeFlags = renderTypeFlags;
+exports.mapElementType = mapElementType;
+exports.inferMapElementType = inferMapElementType;
+exports.arrayElementType = arrayElementType;
+exports.typeOfExpression = typeOfExpression;
+exports.inferredTypeOfExpression = inferredTypeOfExpression;
+exports.isNumber = isNumber;
+exports.isEnumAccess = isEnumAccess;
+exports.isStaticReadonlyAccess = isStaticReadonlyAccess;
+exports.renderFlags = renderFlags;
+exports.determineReturnType = determineReturnType;
 const ts = require("typescript");
 const jsii_utils_1 = require("../jsii/jsii-utils");
 const util_1 = require("../util");
@@ -14,7 +29,6 @@ function firstTypeInUnion(typeChecker, type) {
     }
     return type.types[0];
 }
-exports.firstTypeInUnion = firstTypeInUnion;
 function builtInTypeName(type) {
     if ((0, jsii_utils_1.hasAnyFlag)(type.flags, ts.TypeFlags.Any | ts.TypeFlags.Unknown)) {
         return 'any';
@@ -30,7 +44,6 @@ function builtInTypeName(type) {
     }
     return undefined;
 }
-exports.builtInTypeName = builtInTypeName;
 function renderType(type) {
     if (type.isClassOrInterface()) {
         return type.symbol.name;
@@ -41,7 +54,6 @@ function renderType(type) {
     }
     return renderTypeFlags(type);
 }
-exports.renderType = renderType;
 function parameterAcceptsUndefined(param, type) {
     if (param.initializer !== undefined) {
         return true;
@@ -54,7 +66,6 @@ function parameterAcceptsUndefined(param, type) {
     }
     return false;
 }
-exports.parameterAcceptsUndefined = parameterAcceptsUndefined;
 /**
  * This is a simplified check that should be good enough for most purposes
  */
@@ -67,11 +78,9 @@ function typeContainsUndefined(type) {
     }
     return false;
 }
-exports.typeContainsUndefined = typeContainsUndefined;
 function renderTypeFlags(type) {
     return renderFlags(type.flags, ts.TypeFlags);
 }
-exports.renderTypeFlags = renderTypeFlags;
 /**
  * If this is a map type, return the type mapped *to* (key must always be `string` anyway).
  */
@@ -96,7 +105,6 @@ function mapElementType(type, typeChecker) {
     }
     return { result: 'nonMap' };
 }
-exports.mapElementType = mapElementType;
 /**
  * Try to infer the map element type from the properties if they're all the same
  */
@@ -104,7 +112,6 @@ function inferMapElementType(elements, typeChecker) {
     const types = elements.map((e) => typeOfObjectLiteralProperty(typeChecker, e)).filter(util_1.isDefined);
     return types.every((t) => isSameType(types[0], t)) ? types[0] : undefined;
 }
-exports.inferMapElementType = inferMapElementType;
 function typeOfObjectLiteralProperty(typeChecker, el) {
     if (ts.isPropertyAssignment(el)) {
         return typeOfExpression(typeChecker, el.initializer);
@@ -134,12 +141,10 @@ function arrayElementType(type) {
     }
     return undefined;
 }
-exports.arrayElementType = arrayElementType;
 function typeOfExpression(typeChecker, node) {
     const t = typeChecker.getContextualType(node) ?? typeChecker.getTypeAtLocation(node);
     return (0, jsii_utils_1.resolveEnumLiteral)(typeChecker, t);
 }
-exports.typeOfExpression = typeOfExpression;
 /**
  * Infer type of expression by the argument it is assigned to
  *
@@ -152,16 +157,13 @@ function inferredTypeOfExpression(typeChecker, node) {
     const type = typeChecker.getContextualType(node);
     return type ? typeChecker.getNonNullableType(type) : undefined;
 }
-exports.inferredTypeOfExpression = inferredTypeOfExpression;
 function isNumber(x) {
     return typeof x === 'number';
 }
-exports.isNumber = isNumber;
 function isEnumAccess(typeChecker, access) {
     const symbol = (0, jsii_utils_1.resolvedSymbolAtLocation)(typeChecker, access.expression);
     return symbol ? (0, jsii_utils_1.hasAnyFlag)(symbol.flags, ts.SymbolFlags.Enum) : false;
 }
-exports.isEnumAccess = isEnumAccess;
 function isStaticReadonlyAccess(typeChecker, access) {
     const symbol = (0, jsii_utils_1.resolvedSymbolAtLocation)(typeChecker, access);
     const decl = symbol?.getDeclarations();
@@ -171,7 +173,6 @@ function isStaticReadonlyAccess(typeChecker, access) {
     }
     return false;
 }
-exports.isStaticReadonlyAccess = isStaticReadonlyAccess;
 function renderFlags(flags, flagObject) {
     if (flags === undefined) {
         return '';
@@ -182,7 +183,6 @@ function renderFlags(flags, flagObject) {
         .map((f) => flagObject[f])
         .join(',');
 }
-exports.renderFlags = renderFlags;
 function determineReturnType(typeChecker, node) {
     const signature = typeChecker.getSignatureFromDeclaration(node);
     if (!signature) {
@@ -190,5 +190,4 @@ function determineReturnType(typeChecker, node) {
     }
     return typeChecker.getReturnTypeOfSignature(signature);
 }
-exports.determineReturnType = determineReturnType;
 //# sourceMappingURL=types.js.map