@opra/cli 1.0.0-alpha.16 → 1.0.0-alpha.18

package/cjs/ts-generator/generators/clean-directory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanDirectory = void 0;
+exports.cleanDirectory = cleanDirectory;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
@@ -32,4 +32,3 @@ function cleanDirectory(dirname) {
     };
     _cleanDirectory(dirname);
 }
-exports.cleanDirectory = cleanDirectory;

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

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._generateMappedTypeCode = exports._generateMixinTypeCode = exports._generateSimpleTypeCode = exports._generateComplexTypeCode = exports._generateEnumTypeCode = exports._generateTypeCode = exports.generateDataType = void 0;
+exports.generateDataType = generateDataType;
+exports._generateTypeCode = _generateTypeCode;
+exports._generateEnumTypeCode = _generateEnumTypeCode;
+exports._generateComplexTypeCode = _generateComplexTypeCode;
+exports._generateSimpleTypeCode = _generateSimpleTypeCode;
+exports._generateMixinTypeCode = _generateMixinTypeCode;
+exports._generateMappedTypeCode = _generateMappedTypeCode;
 const tslib_1 = require("tslib");
 const common_1 = require("@opra/common");
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -25,10 +31,11 @@ async function generateDataType(dataType, intent, currentFile) {
         }
         if (dataType instanceof common_1.SimpleType)
             file = this.addFile(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'));
+        else if (dataType instanceof common_1.EnumType) {
+            file = this.addFile(path_1.default.join(this._typesRoot, 'enums', typeName + '.ts'), true);
+        }
         else
-            file = this.addFile(path_1.default.join(this._typesRoot, 'types', typeName + '.ts'));
+            file = this.addFile(path_1.default.join(this._typesRoot, 'types', typeName + '.ts'), true);
         this._filesMap.set(dataType, file);
         if (file.exportTypes.includes(typeName)) {
             if (currentFile)
@@ -56,7 +63,6 @@ export `;
     const code = await this._generateTypeCode(currentFile, dataType, intent);
     return { kind: 'embedded', code };
 }
-exports.generateDataType = generateDataType;
 /**
  *
  */
@@ -82,7 +88,6 @@ async function _generateTypeCode(currentFile, dataType, intent) {
     /* istanbul ignore next */
     throw new TypeError(`${dataType.kind} data types can not be directly exported`);
 }
-exports._generateTypeCode = _generateTypeCode;
 /**
  *
  */
@@ -109,7 +114,6 @@ async function _generateEnumTypeCode(currentFile, dataType, intent) {
             .join(' | ') +
         ')');
 }
-exports._generateEnumTypeCode = _generateEnumTypeCode;
 /**
  *
  */
@@ -169,7 +173,6 @@ async function _generateComplexTypeCode(currentFile, dataType, intent) {
         out += '[key: string]: any;\n';
     return out + '\b}';
 }
-exports._generateComplexTypeCode = _generateComplexTypeCode;
 /**
  *
  */
@@ -178,7 +181,6 @@ async function _generateSimpleTypeCode(currentFile, dataType, intent) {
     out += dataType.nameMappings.js || 'any';
     return intent === 'root' ? out + ';' : out;
 }
-exports._generateSimpleTypeCode = _generateSimpleTypeCode;
 /**
  *
  */
@@ -198,7 +200,6 @@ async function _generateMixinTypeCode(currentFile, dataType, intent) {
         return outArray.join(', ');
     return outArray.join(' & ');
 }
-exports._generateMixinTypeCode = _generateMixinTypeCode;
 /**
  *
  */
@@ -255,4 +256,3 @@ async function _generateMappedTypeCode(currentFile, dataType, intent) {
     }
     return out;
 }
-exports._generateMappedTypeCode = _generateMappedTypeCode;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDocument = void 0;
+exports.generateDocument = generateDocument;
 const tslib_1 = require("tslib");
 const client_1 = require("@opra/client");
 const common_1 = require("@opra/common");
@@ -57,4 +57,3 @@ async function generateDocument(document, options) {
     }
     return out;
 }
-exports.generateDocument = generateDocument;

package/cjs/ts-generator/generators/generate-http-api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateHttpApi = void 0;
+exports.generateHttpApi = generateHttpApi;
 const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const putil_varhelpers_1 = require("putil-varhelpers");
@@ -42,4 +42,3 @@ async function generateHttpApi(api) {
     classBlock.tail = `\b}`;
     return file;
 }
-exports.generateHttpApi = generateHttpApi;

package/cjs/ts-generator/generators/generate-http-controller.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateHttpController = void 0;
+exports.generateHttpController = generateHttpController;
 const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
@@ -233,4 +233,3 @@ async function generateHttpController(controller) {
     classBlock.tail = `\b}`;
     return file;
 }
-exports.generateHttpController = generateHttpController;

package/cjs/ts-generator/utils/locate-named-type.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.locateNamedType = void 0;
+exports.locateNamedType = locateNamedType;
 const common_1 = require("@opra/common");
 function locateNamedType(type) {
     if (!type)
@@ -14,4 +14,3 @@ function locateNamedType(type) {
         return locateNamedType(type.base);
     }
 }
-exports.locateNamedType = locateNamedType;

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

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapTypeArray = exports.wrapStringArray = exports.wrapQuotedString = exports.wrapJSDocString = void 0;
+exports.wrapJSDocString = wrapJSDocString;
+exports.wrapQuotedString = wrapQuotedString;
+exports.wrapStringArray = wrapStringArray;
+exports.wrapTypeArray = wrapTypeArray;
 const tslib_1 = require("tslib");
 const js_string_escape_1 = tslib_1.__importDefault(require("js-string-escape"));
 function wrapJSDocString(s, indent, currentColumn) {
@@ -14,7 +17,6 @@ function wrapJSDocString(s, indent, currentColumn) {
         lineEnd: '',
     });
 }
-exports.wrapJSDocString = wrapJSDocString;
 function wrapQuotedString(s, indent, currentColumn) {
     const arr = (0, js_string_escape_1.default)(s || '')
         .split(' ')
@@ -28,17 +30,14 @@ function wrapQuotedString(s, indent, currentColumn) {
         }) +
         "'");
 }
-exports.wrapQuotedString = wrapQuotedString;
 function wrapStringArray(arr, indent, currentColumn) {
     const ar1 = arr.map((x, i, a) => "'" + x + "'" + (i < a.length - 1 ? ', ' : ''));
     return '[' + _printLines(ar1, { indent, currentColumn }) + ']';
 }
-exports.wrapStringArray = wrapStringArray;
 function wrapTypeArray(arr, indent, currentColumn) {
     const ar1 = arr.map((x, i, a) => x + (i < a.length - 1 ? ' | ' : ''));
     return _printLines(ar1, { indent, currentColumn });
 }
-exports.wrapTypeArray = wrapTypeArray;
 function _printLines(arr, opts = {}) {
     let s = '';
     let line = '';

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

@@ -21,10 +21,11 @@ export async function generateDataType(dataType, intent, currentFile) {
         }
         if (dataType instanceof SimpleType)
             file = this.addFile(path.join(this._documentRoot, '/simple-types.ts'), true);
-        else if (dataType instanceof EnumType)
-            file = this.addFile(path.join(this._typesRoot, 'enums', typeName + '.ts'));
+        else if (dataType instanceof EnumType) {
+            file = this.addFile(path.join(this._typesRoot, 'enums', typeName + '.ts'), true);
+        }
         else
-            file = this.addFile(path.join(this._typesRoot, 'types', typeName + '.ts'));
+            file = this.addFile(path.join(this._typesRoot, 'types', typeName + '.ts'), true);
         this._filesMap.set(dataType, file);
         if (file.exportTypes.includes(typeName)) {
             if (currentFile)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "1.0.0-alpha.16",
+  "version": "1.0.0-alpha.18",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "@browsery/type-is": "^1.6.18-r3",
-    "@opra/client": "^1.0.0-alpha.16",
-    "@opra/common": "^1.0.0-alpha.16",
+    "@opra/client": "^1.0.0-alpha.18",
+    "@opra/common": "^1.0.0-alpha.18",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "js-string-escape": "^1.0.1",

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'node:events';
 import { ApiDocument } from '@opra/common';
 import { IFileWriter } from '../interfaces/file-writer.interface.js';