@opra/cli 1.0.0-alpha.29 → 1.0.0-alpha.31

package/cjs/oprimp-cli.js

@@ -16,6 +16,7 @@ commander_1.program
     .argument('<serviceUrl>', 'OPRA service url')
     .argument('<outDir>', 'Output directory')
     .option('--ext', 'Adds js extension to imports')
+    .option('--refns', 'Exports references with namespaces')
     .option('--no-color', 'Disables colors in logs messages')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
@@ -25,6 +26,7 @@ commander_1.program
         logger: console,
         outDir,
         importExt: options.ext,
+        referenceNamespaces: options.refns,
         fileHeader: `/* Generated by OPRA Code Generator, Version ${pkgJson.version} */`,
     });
     await generator

package/cjs/ts-generator/generators/generate-data-type.js

@@ -45,7 +45,7 @@ async function generateDataType(dataType, intent, currentFile) {
         file.exportTypes.push(typeName);
         const typesIndexTs = this.addFile(path_1.default.join(this._typesRoot, 'index.ts'), true);
         const indexTs = this.addFile('/index.ts', true);
-        indexTs.addExport(typesIndexTs.filename);
+        indexTs.addExport(typesIndexTs.filename, undefined, this._typesNamespace);
         const codeBlock = (file.code['type_' + typeName] = new code_block_js_1.CodeBlock());
         codeBlock.head = `/**\n * ${(0, string_utils_js_1.wrapJSDocString)(dataType.description || '')}\n *`;
         codeBlock.head += `

package/cjs/ts-generator/generators/generate-document.js

@@ -29,13 +29,16 @@ async function generateDocument(document, options) {
     this._documentsMap.set(document.id, out);
     this.emit('log', chalk_1.default.white('[' + document.id + '] ') + chalk_1.default.cyan('Processing document ') + chalk_1.default.magenta(document.info.title));
     if (document.references.size) {
+        let refIdGenerator = options?.refIdGenerator || 1;
         this.emit('log', chalk_1.default.white('[' + document.id + '] ') + chalk_1.default.cyan(`Processing references`));
         for (const ref of document.references.values()) {
             const generator = this.extend();
             generator._document = ref;
-            generator._documentRoot = '/references/' + (ref.info.title ? (0, putil_varhelpers_1.pascalCase)(ref.info.title) : ref.id);
+            const typesNamespace = ref.api?.name || (ref.info.title ? (0, putil_varhelpers_1.pascalCase)(ref.info.title) : `Reference${refIdGenerator++}`);
+            generator._documentRoot = '/references/' + typesNamespace;
             generator._typesRoot = path_1.default.join(generator._documentRoot, 'models');
-            await generator.generateDocument(ref, { typesOnly: true });
+            generator._typesNamespace = !this.options.referenceNamespaces || ref[common_1.BUILTIN] ? '' : typesNamespace;
+            await generator.generateDocument(ref, { typesOnly: true, refIdGenerator });
         }
     }
     this._fileHeaderDocInfo = `/*

package/cjs/ts-generator/ts-file.js

@@ -35,7 +35,7 @@ class TsFile {
                 imp.items.push(x);
         });
     }
-    addExport(filename, types) {
+    addExport(filename, types, namespace) {
         if (isLocalFile(filename)) {
             filename = path_1.default.relative(this.dirname, path_1.default.resolve(this.dirname, filename));
             if (!filename.startsWith('.'))
@@ -45,10 +45,11 @@ class TsFile {
             filename = filename.substring(0, filename.length - 5);
         if (filename.endsWith('.ts') || filename.endsWith('.js'))
             filename = filename.substring(0, filename.length - 3);
-        this.exportFiles[filename] = this.exportFiles[filename] || [];
+        const key = (namespace ? namespace + ':' : '') + filename;
+        this.exportFiles[key] = this.exportFiles[key] || { filename, items: [], namespace };
         types?.forEach(x => {
-            if (!this.exportFiles[filename].includes(x))
-                this.exportFiles[filename].push(x);
+            if (!this.exportFiles[filename].items.includes(x))
+                this.exportFiles[filename].items.push(x);
         });
     }
     generate(options) {
@@ -76,13 +77,18 @@ class TsFile {
             .join('\n');
         this.code.exports = Object.keys(this.exportFiles)
             .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
-            .map(filename => {
-            const types = this.exportFiles[filename];
+            .map(key => {
+            const exportFile = this.exportFiles[key];
+            const types = exportFile.items;
+            let filename = exportFile.filename;
             if (!isPackageName(filename)) {
                 if (options?.importExt)
                     filename += '.js';
             }
-            return `export ${types.length ? '{ ' + types.join(', ') + ' }' : '*'} from '${filename}';`;
+            let out = `export ${types.length ? '{ ' + types.join(', ') + ' }' : '*'}`;
+            if (exportFile.namespace)
+                out += ` as ${exportFile.namespace}`;
+            return out + ` from '${filename}';`;
         })
             .join('\n');
         if (this.code.imports || this.code.exports)

package/cjs/ts-generator/ts-generator.js

@@ -24,14 +24,14 @@ class TsGenerator extends node_events_1.EventEmitter {
      */
     constructor(init) {
         super();
-        this._started = false;
         this._files = {};
+        this._started = false;
         this.serviceUrl = init.serviceUrl;
         this.cwd = init.cwd || node_process_1.default.cwd();
         this.outDir = init.outDir ? node_path_1.default.resolve(this.cwd, init.outDir) : this.cwd;
         this.fileHeader = init.fileHeader || '';
         this.writer = init.writer || new file_writer_js_1.FileWriter();
-        this.options = { importExt: !!init.importExt };
+        this.options = { importExt: !!init.importExt, referenceNamespaces: init.referenceNamespaces };
         this._documentsMap = new Map();
         this._filesMap = new WeakMap();
         this.on('log', (message, ...args) => init.logger?.log?.(message, ...args));

package/esm/oprimp-cli.js

@@ -13,6 +13,7 @@ program
     .argument('<serviceUrl>', 'OPRA service url')
     .argument('<outDir>', 'Output directory')
     .option('--ext', 'Adds js extension to imports')
+    .option('--refns', 'Exports references with namespaces')
     .option('--no-color', 'Disables colors in logs messages')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
@@ -22,6 +23,7 @@ program
         logger: console,
         outDir,
         importExt: options.ext,
+        referenceNamespaces: options.refns,
         fileHeader: `/* Generated by OPRA Code Generator, Version ${pkgJson.version} */`,
     });
     await generator

package/esm/ts-generator/generators/generate-data-type.js

@@ -35,7 +35,7 @@ export async function generateDataType(dataType, intent, currentFile) {
         file.exportTypes.push(typeName);
         const typesIndexTs = this.addFile(path.join(this._typesRoot, 'index.ts'), true);
         const indexTs = this.addFile('/index.ts', true);
-        indexTs.addExport(typesIndexTs.filename);
+        indexTs.addExport(typesIndexTs.filename, undefined, this._typesNamespace);
         const codeBlock = (file.code['type_' + typeName] = new CodeBlock());
         codeBlock.head = `/**\n * ${wrapJSDocString(dataType.description || '')}\n *`;
         codeBlock.head += `

package/esm/ts-generator/generators/generate-document.js

@@ -1,5 +1,5 @@
 import { OpraHttpClient } from '@opra/client';
-import { HttpApi } from '@opra/common';
+import { BUILTIN, HttpApi } from '@opra/common';
 import chalk from 'chalk';
 import path from 'path';
 import { pascalCase } from 'putil-varhelpers';
@@ -25,13 +25,16 @@ export async function generateDocument(document, options) {
     this._documentsMap.set(document.id, out);
     this.emit('log', chalk.white('[' + document.id + '] ') + chalk.cyan('Processing document ') + chalk.magenta(document.info.title));
     if (document.references.size) {
+        let refIdGenerator = options?.refIdGenerator || 1;
         this.emit('log', chalk.white('[' + document.id + '] ') + chalk.cyan(`Processing references`));
         for (const ref of document.references.values()) {
             const generator = this.extend();
             generator._document = ref;
-            generator._documentRoot = '/references/' + (ref.info.title ? pascalCase(ref.info.title) : ref.id);
+            const typesNamespace = ref.api?.name || (ref.info.title ? pascalCase(ref.info.title) : `Reference${refIdGenerator++}`);
+            generator._documentRoot = '/references/' + typesNamespace;
             generator._typesRoot = path.join(generator._documentRoot, 'models');
-            await generator.generateDocument(ref, { typesOnly: true });
+            generator._typesNamespace = !this.options.referenceNamespaces || ref[BUILTIN] ? '' : typesNamespace;
+            await generator.generateDocument(ref, { typesOnly: true, refIdGenerator });
         }
     }
     this._fileHeaderDocInfo = `/*

package/esm/ts-generator/ts-file.js

@@ -31,7 +31,7 @@ export class TsFile {
                 imp.items.push(x);
         });
     }
-    addExport(filename, types) {
+    addExport(filename, types, namespace) {
         if (isLocalFile(filename)) {
             filename = path.relative(this.dirname, path.resolve(this.dirname, filename));
             if (!filename.startsWith('.'))
@@ -41,10 +41,11 @@ export class TsFile {
             filename = filename.substring(0, filename.length - 5);
         if (filename.endsWith('.ts') || filename.endsWith('.js'))
             filename = filename.substring(0, filename.length - 3);
-        this.exportFiles[filename] = this.exportFiles[filename] || [];
+        const key = (namespace ? namespace + ':' : '') + filename;
+        this.exportFiles[key] = this.exportFiles[key] || { filename, items: [], namespace };
         types?.forEach(x => {
-            if (!this.exportFiles[filename].includes(x))
-                this.exportFiles[filename].push(x);
+            if (!this.exportFiles[filename].items.includes(x))
+                this.exportFiles[filename].items.push(x);
         });
     }
     generate(options) {
@@ -72,13 +73,18 @@ export class TsFile {
             .join('\n');
         this.code.exports = Object.keys(this.exportFiles)
             .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
-            .map(filename => {
-            const types = this.exportFiles[filename];
+            .map(key => {
+            const exportFile = this.exportFiles[key];
+            const types = exportFile.items;
+            let filename = exportFile.filename;
             if (!isPackageName(filename)) {
                 if (options?.importExt)
                     filename += '.js';
             }
-            return `export ${types.length ? '{ ' + types.join(', ') + ' }' : '*'} from '${filename}';`;
+            let out = `export ${types.length ? '{ ' + types.join(', ') + ' }' : '*'}`;
+            if (exportFile.namespace)
+                out += ` as ${exportFile.namespace}`;
+            return out + ` from '${filename}';`;
         })
             .join('\n');
         if (this.code.imports || this.code.exports)

package/esm/ts-generator/ts-generator.js

@@ -20,14 +20,14 @@ export class TsGenerator extends EventEmitter {
      */
     constructor(init) {
         super();
-        this._started = false;
         this._files = {};
+        this._started = false;
         this.serviceUrl = init.serviceUrl;
         this.cwd = init.cwd || process.cwd();
         this.outDir = init.outDir ? path.resolve(this.cwd, init.outDir) : this.cwd;
         this.fileHeader = init.fileHeader || '';
         this.writer = init.writer || new FileWriter();
-        this.options = { importExt: !!init.importExt };
+        this.options = { importExt: !!init.importExt, referenceNamespaces: init.referenceNamespaces };
         this._documentsMap = new Map();
         this._filesMap = new WeakMap();
         this.on('log', (message, ...args) => init.logger?.log?.(message, ...args));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "1.0.0-alpha.29",
+  "version": "1.0.0-alpha.31",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -32,13 +32,14 @@
   },
   "dependencies": {
     "@browsery/type-is": "^1.6.18-r3",
-    "@opra/client": "^1.0.0-alpha.29",
-    "@opra/common": "^1.0.0-alpha.29",
+    "@opra/client": "^1.0.0-alpha.31",
+    "@opra/common": "^1.0.0-alpha.31",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "js-string-escape": "^1.0.1",
     "putil-flattentext": "^2.1.1",
-    "putil-varhelpers": "^1.6.5"
+    "putil-varhelpers": "^1.6.5",
+    "tslib": "^2.6.3"
   },
   "type": "module",
   "module": "./esm/index.js",

package/types/ts-generator/ts-file.d.ts

@@ -6,12 +6,16 @@ export declare class TsFile {
         items: string[];
         typeImport?: boolean;
     }>;
-    exportFiles: Record<string, string[]>;
+    exportFiles: Record<string, {
+        filename: string;
+        items: string[];
+        namespace?: string;
+    }>;
     exportTypes: string[];
     code: CodeBlock;
     constructor(filename: string);
     addImport(filename: string, items?: string[], typeImport?: boolean): void;
-    addExport(filename: string, types?: string[]): void;
+    addExport(filename: string, types?: string[], namespace?: string): void;
     generate(options?: {
         importExt?: boolean;
     }): string;

package/types/ts-generator/ts-generator.d.ts

@@ -20,6 +20,7 @@ export declare namespace TsGenerator {
         writer?: IFileWriter;
         fileHeader?: string;
         importExt?: boolean;
+        referenceNamespaces?: boolean;
     }
 }
 /**
@@ -37,13 +38,14 @@ export declare class TsGenerator extends EventEmitter {
     protected _generateMixinTypeCode: typeof _generateMixinTypeCode;
     protected generateHttpApi: typeof generateHttpApi;
     protected generateHttpController: typeof generateHttpController;
-    protected _started: boolean;
-    protected _document?: ApiDocument;
     protected _documentRoot: string;
     protected _typesRoot: string;
+    protected _typesNamespace: string;
     protected _apiPath: string;
     protected _fileHeaderDocInfo: string;
     protected _files: Record<string, TsFile>;
+    protected _started: boolean;
+    protected _document?: ApiDocument;
     protected _documentsMap: Map<string, {
         document: ApiDocument;
         generator: TsGenerator;
@@ -55,6 +57,7 @@ export declare class TsGenerator extends EventEmitter {
     readonly writer: IFileWriter;
     readonly options: {
         importExt: boolean;
+        referenceNamespaces?: boolean;
     };
     fileHeader: string;
     /**