@opra/common 1.0.0-alpha.10 → 1.0.0-alpha.12

package/browser.js

@@ -828,6 +828,7 @@ __name(ComplexTypeDecorator, "ComplexTypeDecorator");
 import { asMutable as asMutable4 } from "ts-gems";
 
 // ../../build/common/esm/document/common/document-element.js
+import crypto from "node:crypto";
 import { asMutable } from "ts-gems";
 
 // ../../build/common/esm/document/common/document-node.js
@@ -953,6 +954,7 @@ var DocumentElement = /* @__PURE__ */ __name(function(owner) {
   if (!this)
     throw new TypeError('"this" should be passed to call class constructor');
   const _this = asMutable(this);
+  _this.id = crypto.randomBytes(16).toString("base64url");
   Object.defineProperty(_this, "node", {
     value: new DocumentNode(this, owner?.node),
     enumerable: false,
@@ -2316,7 +2318,6 @@ var ApiBase = class extends DocumentElement {
 };
 
 // ../../build/common/esm/document/http/http-controller.js
-import nodePath from "node:path";
 import { asMutable as asMutable10 } from "ts-gems";
 
 // ../../build/common/esm/document/common/data-type-map.js
@@ -2572,7 +2573,8 @@ var HttpControllerClass = class extends DocumentElement {
     }
   }
   getFullUrl() {
-    return nodePath.posix.join(this.owner instanceof HttpController2 ? this.owner.getFullUrl() : "/", this.path);
+    const out = this.owner instanceof HttpController2 ? this.owner.getFullUrl() : "/";
+    return out + this.path;
   }
   /**
    *
@@ -2769,7 +2771,7 @@ var HttpMultipartField = class extends HttpMediaType {
 };
 
 // ../../build/common/esm/document/http/http-operation.js
-import nodePath2 from "node:path";
+import nodePath from "node:path";
 import { asMutable as asMutable12 } from "ts-gems";
 
 // ../../build/common/esm/document/decorators/http-operation.decorator.js
@@ -3200,13 +3202,14 @@ var HttpOperationClass = class extends DocumentElement {
   }
   getFullUrl() {
     const out = this.owner.getFullUrl();
-    return out ? this.path ? nodePath2.posix.join(out, this.path) : out : this.path || "/";
+    return out ? this.path ? nodePath.posix.join(out, this.path) : out : this.path || "/";
   }
   toJSON() {
     const out = omitUndefined({
       kind: OpraSchema.HttpOperation.Kind,
       description: this.description,
       method: this.method,
+      path: this.path,
       composition: this.composition,
       requestBody: this.requestBody?.toJSON()
     });
@@ -13109,7 +13112,7 @@ function getDataTypeName(typ) {
 __name(getDataTypeName, "getDataTypeName");
 
 // ../../build/common/esm/document/factory/api-document.factory.js
-import crypto from "node:crypto";
+import crypto2 from "node:crypto";
 import { asMutable as asMutable15 } from "ts-gems";
 var OPRA_SPEC_URL = "https://oprajs.com/spec/v" + OpraSchema.SpecVersion;
 var ApiDocumentFactory = class _ApiDocumentFactory {
@@ -13161,9 +13164,14 @@ var ApiDocumentFactory = class _ApiDocumentFactory {
       init.url = schemaOrUrl;
     } else
       init = schemaOrUrl;
+    let builtinDocument;
     if (!document[BUILTIN]) {
-      const builtinDocument = await this.createBuiltinDocument(context);
-      document.references.set("opra", builtinDocument);
+      const t = document.node.findDataType("string");
+      builtinDocument = t?.node.getDocument();
+      if (!builtinDocument) {
+        builtinDocument = await this.createBuiltinDocument(context);
+        document.references.set("opra", builtinDocument);
+      }
     }
     init.spec = init.spec || OpraSchema.SpecVersion;
     document.url = init.url;
@@ -13183,6 +13191,8 @@ var ApiDocumentFactory = class _ApiDocumentFactory {
               return;
             }
             const refDoc = new ApiDocument();
+            if (builtinDocument)
+              refDoc.references.set("opra", builtinDocument);
             await this.initDocument(refDoc, context, r);
             document.references.set(ns, refDoc);
           });
@@ -13205,7 +13215,7 @@ var ApiDocumentFactory = class _ApiDocumentFactory {
       });
     }
     const x = document.export();
-    asMutable15(document).id = crypto.createHash("md5").update(JSON.stringify(x)).digest("base64url");
+    asMutable15(document).id = crypto2.createHash("md5").update(JSON.stringify(x)).digest("base64url");
   }
   /**
    *

package/cjs/document/common/document-element.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentElement = void 0;
+const tslib_1 = require("tslib");
+const node_crypto_1 = tslib_1.__importDefault(require("node:crypto"));
 const ts_gems_1 = require("ts-gems");
 const document_node_js_1 = require("./document-node.js");
 /**
@@ -11,6 +13,7 @@ exports.DocumentElement = function (owner) {
     if (!this)
         throw new TypeError('"this" should be passed to call class constructor');
     const _this = (0, ts_gems_1.asMutable)(this);
+    _this.id = node_crypto_1.default.randomBytes(16).toString('base64url');
     Object.defineProperty(_this, 'node', {
         value: new document_node_js_1.DocumentNode(this, owner?.node),
         enumerable: false,

package/cjs/document/factory/api-document.factory.js

@@ -68,9 +68,14 @@ class ApiDocumentFactory {
         else
             init = schemaOrUrl;
         // Add builtin data types if this document is the root
+        let builtinDocument;
         if (!document[constants_js_1.BUILTIN]) {
-            const builtinDocument = await this.createBuiltinDocument(context);
-            document.references.set('opra', builtinDocument);
+            const t = document.node.findDataType('string');
+            builtinDocument = t?.node.getDocument();
+            if (!builtinDocument) {
+                builtinDocument = await this.createBuiltinDocument(context);
+                document.references.set('opra', builtinDocument);
+            }
         }
         init.spec = init.spec || index_js_2.OpraSchema.SpecVersion;
         document.url = init.url;
@@ -91,6 +96,8 @@ class ApiDocumentFactory {
                             return;
                         }
                         const refDoc = new api_document_js_1.ApiDocument();
+                        if (builtinDocument)
+                            refDoc.references.set('opra', builtinDocument);
                         await this.initDocument(refDoc, context, r);
                         document.references.set(ns, refDoc);
                     });

package/cjs/document/http/http-controller.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpController = void 0;
-const tslib_1 = require("tslib");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const ts_gems_1 = require("ts-gems");
 const index_js_1 = require("../../helpers/index.js");
 const index_js_2 = require("../../schema/index.js");
@@ -102,7 +100,8 @@ class HttpControllerClass extends document_element_js_1.DocumentElement {
         }
     }
     getFullUrl() {
-        return node_path_1.default.posix.join(this.owner instanceof exports.HttpController ? this.owner.getFullUrl() : '/', this.path);
+        const out = this.owner instanceof exports.HttpController ? this.owner.getFullUrl() : '/';
+        return out + this.path;
     }
     /**
      *

package/cjs/document/http/http-operation.js

@@ -64,6 +64,7 @@ class HttpOperationClass extends document_element_js_1.DocumentElement {
             kind: index_js_2.OpraSchema.HttpOperation.Kind,
             description: this.description,
             method: this.method,
+            path: this.path,
             composition: this.composition,
             requestBody: this.requestBody?.toJSON(),
         });

package/esm/document/common/document-element.js

@@ -1,3 +1,4 @@
+import crypto from 'node:crypto';
 import { asMutable } from 'ts-gems';
 import { DocumentNode } from './document-node.js';
 /**
@@ -8,6 +9,7 @@ export const DocumentElement = function (owner) {
     if (!this)
         throw new TypeError('"this" should be passed to call class constructor');
     const _this = asMutable(this);
+    _this.id = crypto.randomBytes(16).toString('base64url');
     Object.defineProperty(_this, 'node', {
         value: new DocumentNode(this, owner?.node),
         enumerable: false,

package/esm/document/factory/api-document.factory.js

@@ -64,9 +64,14 @@ export class ApiDocumentFactory {
         else
             init = schemaOrUrl;
         // Add builtin data types if this document is the root
+        let builtinDocument;
         if (!document[BUILTIN]) {
-            const builtinDocument = await this.createBuiltinDocument(context);
-            document.references.set('opra', builtinDocument);
+            const t = document.node.findDataType('string');
+            builtinDocument = t?.node.getDocument();
+            if (!builtinDocument) {
+                builtinDocument = await this.createBuiltinDocument(context);
+                document.references.set('opra', builtinDocument);
+            }
         }
         init.spec = init.spec || OpraSchema.SpecVersion;
         document.url = init.url;
@@ -87,6 +92,8 @@ export class ApiDocumentFactory {
                             return;
                         }
                         const refDoc = new ApiDocument();
+                        if (builtinDocument)
+                            refDoc.references.set('opra', builtinDocument);
                         await this.initDocument(refDoc, context, r);
                         document.references.set(ns, refDoc);
                     });

package/esm/document/http/http-controller.js

@@ -1,4 +1,3 @@
-import nodePath from 'node:path';
 import { asMutable } from 'ts-gems';
 import { omitUndefined, ResponsiveMap } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
@@ -98,7 +97,8 @@ class HttpControllerClass extends DocumentElement {
         }
     }
     getFullUrl() {
-        return nodePath.posix.join(this.owner instanceof HttpController ? this.owner.getFullUrl() : '/', this.path);
+        const out = this.owner instanceof HttpController ? this.owner.getFullUrl() : '/';
+        return out + this.path;
     }
     /**
      *

package/esm/document/http/http-operation.js

@@ -60,6 +60,7 @@ class HttpOperationClass extends DocumentElement {
             kind: OpraSchema.HttpOperation.Kind,
             description: this.description,
             method: this.method,
+            path: this.path,
             composition: this.composition,
             requestBody: this.requestBody?.toJSON(),
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.12",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",

package/types/document/common/document-element.d.ts

@@ -17,6 +17,7 @@ export declare const DocumentElement: DocumentElementConstructor;
  * @class DocumentElement
  */
 declare abstract class DocumentElementClass {
+    readonly id: string;
     readonly owner?: DocumentElement;
     readonly node: DocumentNode;
 }