@opra/cli 1.0.0-alpha.38 → 1.0.0-alpha.39

package/cjs/file-writer.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileWriter = void 0;
 const tslib_1 = require("tslib");
-const fs_1 = tslib_1.__importDefault(require("fs"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 class FileWriter {
     writeFile(filename, contents) {
-        fs_1.default.writeFileSync(filename, contents, 'utf-8');
+        node_fs_1.default.writeFileSync(filename, contents, 'utf-8');
     }
 }
 exports.FileWriter = FileWriter;

package/cjs/oprimp-cli.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const console = tslib_1.__importStar(require("node:console"));
+const fs = tslib_1.__importStar(require("node:fs"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const process = tslib_1.__importStar(require("node:process"));
 const common_1 = require("@opra/common");
 const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
 const commander_1 = require("commander");
-const console = tslib_1.__importStar(require("console"));
-const fs = tslib_1.__importStar(require("fs"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const process = tslib_1.__importStar(require("process"));
 const ts_generator_js_1 = require("./ts-generator/ts-generator.js");
-const dirname = path_1.default.dirname((0, common_1.getStackFileName)());
-const pkgJson = JSON.parse(fs.readFileSync(path_1.default.resolve(dirname, '../package.json'), 'utf-8'));
+const dirname = node_path_1.default.dirname((0, common_1.getStackFileName)());
+const pkgJson = JSON.parse(fs.readFileSync(node_path_1.default.resolve(dirname, '../package.json'), 'utf-8'));
 commander_1.program
     .version(pkgJson.version)
     .argument('<serviceUrl>', 'OPRA service url')

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

@@ -8,8 +8,8 @@ exports._generateSimpleTypeCode = _generateSimpleTypeCode;
 exports._generateMixinTypeCode = _generateMixinTypeCode;
 exports._generateMappedTypeCode = _generateMappedTypeCode;
 const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const common_1 = require("@opra/common");
-const path_1 = tslib_1.__importDefault(require("path"));
 const code_block_js_1 = require("../../code-block.js");
 const string_utils_js_1 = require("../utils/string-utils.js");
 const internalTypeNames = ['any', 'boolean', 'bigint', 'number', 'null', 'string', 'object'];
@@ -30,12 +30,12 @@ async function generateDataType(dataType, intent, currentFile) {
             return { kind: 'named', file, typeName: dataType.name };
         }
         if (dataType instanceof common_1.SimpleType)
-            file = this.addFile(path_1.default.join(this._documentRoot, '/simple-types.ts'), true);
+            file = this.addFile(node_path_1.default.join(this._documentRoot, '/simple-types.ts'), true);
         else if (dataType instanceof common_1.EnumType) {
-            file = this.addFile(path_1.default.join(this._typesRoot, 'enums', typeName + '.ts'), true);
+            file = this.addFile(node_path_1.default.join(this._typesRoot, 'enums', typeName + '.ts'), true);
         }
         else
-            file = this.addFile(path_1.default.join(this._typesRoot, 'types', typeName + '.ts'), true);
+            file = this.addFile(node_path_1.default.join(this._typesRoot, 'types', typeName + '.ts'), true);
         this._filesMap.set(dataType, file);
         if (file.exportTypes.includes(typeName)) {
             if (currentFile)
@@ -43,13 +43,13 @@ async function generateDataType(dataType, intent, currentFile) {
             return { kind: 'named', file, typeName: dataType.name };
         }
         file.exportTypes.push(typeName);
-        const typesIndexTs = this.addFile(path_1.default.join(this._typesRoot, 'index.ts'), true);
+        const typesIndexTs = this.addFile(node_path_1.default.join(this._typesRoot, 'index.ts'), true);
         const indexTs = this.addFile('/index.ts', true);
         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 += `
- * @url ${path_1.default.posix.join(doc.url || this.serviceUrl, '$schema', '#types/' + typeName)}
+ * @url ${node_path_1.default.posix.join(doc.url || this.serviceUrl, '$schema', '#types/' + typeName)}
  */
 export `;
         codeBlock.typeDef = (await this._generateTypeCode(file, dataType, 'root')) + '\n\n';

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDocument = generateDocument;
 const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const client_1 = require("@opra/client");
 const common_1 = require("@opra/common");
 const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
-const path_1 = tslib_1.__importDefault(require("path"));
 const putil_varhelpers_1 = require("putil-varhelpers");
 async function generateDocument(document, options) {
     if (!document || typeof document === 'string') {
@@ -38,7 +38,7 @@ async function generateDocument(document, options) {
             generator._document = ref;
             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');
+            generator._typesRoot = node_path_1.default.join(generator._documentRoot, 'models');
             generator._typesNamespace = !this.options.referenceNamespaces || ref[common_1.BUILTIN] ? '' : typesNamespace;
             await generator.generateDocument(ref, { typesOnly: true, refIdGenerator });
         }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TsFile = void 0;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const putil_flattentext_1 = tslib_1.__importDefault(require("putil-flattentext"));
 const code_block_js_1 = require("../code-block.js");
 class TsFile {
@@ -12,14 +12,14 @@ class TsFile {
         this.exportFiles = {};
         this.exportTypes = [];
         this.code = new code_block_js_1.CodeBlock();
-        this.dirname = path_1.default.dirname(filename);
+        this.dirname = node_path_1.default.dirname(filename);
         this.code.header = '';
         this.code.imports = '';
         this.code.exports = '';
     }
     addImport(filename, items, typeImport) {
         if (isLocalFile(filename)) {
-            filename = path_1.default.relative(this.dirname, path_1.default.resolve(this.dirname, filename));
+            filename = node_path_1.default.relative(this.dirname, node_path_1.default.resolve(this.dirname, filename));
             if (!filename.startsWith('.'))
                 filename = './' + filename;
         }
@@ -37,7 +37,7 @@ class TsFile {
     }
     addExport(filename, types, namespace) {
         if (isLocalFile(filename)) {
-            filename = path_1.default.relative(this.dirname, path_1.default.resolve(this.dirname, filename));
+            filename = node_path_1.default.relative(this.dirname, node_path_1.default.resolve(this.dirname, filename));
             if (!filename.startsWith('.'))
                 filename = './' + filename;
         }

package/esm/file-writer.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'node:fs';
 export class FileWriter {
     writeFile(filename, contents) {
         fs.writeFileSync(filename, contents, 'utf-8');

package/esm/oprimp-cli.js

@@ -1,10 +1,10 @@
+import * as console from 'node:console';
+import * as fs from 'node:fs';
+import path from 'node:path';
+import * as process from 'node:process';
 import { getStackFileName } from '@opra/common';
 import colors from 'ansi-colors';
 import { program } from 'commander';
-import * as console from 'console';
-import * as fs from 'fs';
-import path from 'path';
-import * as process from 'process';
 import { TsGenerator } from './ts-generator/ts-generator.js';
 const dirname = path.dirname(getStackFileName());
 const pkgJson = JSON.parse(fs.readFileSync(path.resolve(dirname, '../package.json'), 'utf-8'));

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

@@ -1,5 +1,5 @@
+import path from 'node:path';
 import { ComplexType, EnumType, MappedType, MixinType, SimpleType } from '@opra/common';
-import path from 'path';
 import { CodeBlock } from '../../code-block.js';
 import { wrapJSDocString } from '../utils/string-utils.js';
 const internalTypeNames = ['any', 'boolean', 'bigint', 'number', 'null', 'string', 'object'];

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

@@ -1,7 +1,7 @@
+import path from 'node:path';
 import { OpraHttpClient } from '@opra/client';
 import { BUILTIN, HttpApi } from '@opra/common';
 import colors from 'ansi-colors';
-import path from 'path';
 import { pascalCase } from 'putil-varhelpers';
 export async function generateDocument(document, options) {
     if (!document || typeof document === 'string') {

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

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import flattenText from 'putil-flattentext';
 import { CodeBlock } from '../code-block.js';
 export class TsFile {

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@opra/cli",
-  "version": "1.0.0-alpha.38",
+  "version": "1.0.0-alpha.39",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "@browsery/type-is": "^1.6.18-r5",
-    "@opra/client": "^1.0.0-alpha.38",
-    "@opra/common": "^1.0.0-alpha.38",
+    "@opra/client": "^1.0.0-alpha.39",
+    "@opra/common": "^1.0.0-alpha.39",
     "ansi-colors": "^4.1.3",
     "commander": "^12.0.0",
     "js-string-escape": "^1.0.1",
     "putil-flattentext": "^2.1.1",
     "putil-varhelpers": "^1.6.5",
-    "tslib": "^2.6.3"
+    "tslib": "^2.7.0"
   },
   "type": "module",
   "exports": {

package/types/file-writer.d.ts

@@ -1,4 +1,4 @@
-import { IFileWriter } from './interfaces/file-writer.interface.js';
+import type { IFileWriter } from './interfaces/file-writer.interface.js';
 export declare class FileWriter implements IFileWriter {
     writeFile(filename: string, contents: string): void;
 }

package/types/interfaces/service-generation-context.interface.d.ts

@@ -1,6 +1,6 @@
 import { ApiDocument } from '@opra/common';
-import { IFileWriter } from './file-writer.interface.js';
-import { ILogger } from './logger.interface.js';
+import type { IFileWriter } from './file-writer.interface.js';
+import type { ILogger } from './logger.interface.js';
 export interface ServiceGenerationContext {
     serviceUrl: string;
     document: ApiDocument;

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

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'node:events';
 import { ApiDocument } from '@opra/common';
-import { IFileWriter } from '../interfaces/file-writer.interface.js';
-import { ILogger } from '../interfaces/logger.interface.js';
+import type { IFileWriter } from '../interfaces/file-writer.interface.js';
+import type { ILogger } from '../interfaces/logger.interface.js';
 import { cleanDirectory } from './generators/clean-directory.js';
 import { _generateComplexTypeCode, _generateEnumTypeCode, _generateMappedTypeCode, _generateMixinTypeCode, _generateSimpleTypeCode, _generateTypeCode, generateDataType } from './generators/generate-data-type.js';
 import { generateDocument } from './generators/generate-document.js';