@e22m4u/js-openapi 0.0.8 → 0.1.0

package/dist/cjs/index.cjs

@@ -257,7 +257,6 @@ var import_js_format7 = require("@e22m4u/js-format");
 
 // src/oa-document-builder.js
 var import_js_format6 = require("@e22m4u/js-format");
-var import_js_service = require("@e22m4u/js-service");
 
 // src/oa-document-object/validate-oa-document-object.js
 var import_js_format5 = require("@e22m4u/js-format");
@@ -1906,7 +1905,7 @@ var OA_COMPONENT_TYPE_TO_DEFINITION_NAME_MAP = {
   [OAComponentType.CALLBACK]: "callbacks-or-reference",
   [OAComponentType.PATH_ITEM]: "path-item"
 };
-var OADocumentBuilder = class extends import_js_service.Service {
+var OADocumentBuilder = class {
   static {
     __name(this, "OADocumentBuilder");
   }
@@ -1927,24 +1926,9 @@ var OADocumentBuilder = class extends import_js_service.Service {
   /**
    * Constructor.
    *
-   * @param {import('@e22m4u/js-service').ServiceContainer|import('./oa-document-builder.js').OADocumentInput} containerOrDocument
-   * @param {import('./oa-document-builder.js').OADocumentInput} document
+   * @param {import('./oa-document-builder.js').OADocumentInput} [document]
    */
-  constructor(containerOrDocument, document) {
-    if ((0, import_js_service.isServiceContainer)(containerOrDocument)) {
-      super(containerOrDocument);
-    } else {
-      super();
-      if (containerOrDocument !== void 0) {
-        if (!containerOrDocument || typeof containerOrDocument !== "object" || Array.isArray(containerOrDocument)) {
-          throw new import_js_format6.InvalidArgumentError(
-            'Parameter "containerOrDocument" must be an Object, but %v was given.',
-            containerOrDocument
-          );
-        }
-      }
-      document = document === void 0 ? containerOrDocument : document;
-    }
+  constructor(document) {
     if (document !== void 0) {
       if (!document || typeof document !== "object" || Array.isArray(document)) {
         throw new import_js_format6.InvalidArgumentError(
@@ -2003,14 +1987,14 @@ var OADocumentBuilder = class extends import_js_service.Service {
     if (!componentsKey) {
       throw new import_js_format6.InvalidArgumentError(
         "Component type %v does not have a reference to the components key.",
-        componentsKey
+        type
       );
     }
     const definitionName = OA_COMPONENT_TYPE_TO_DEFINITION_NAME_MAP[type];
     if (!definitionName) {
       throw new import_js_format6.InvalidArgumentError(
         "Component type %v does not have a reference to the definition name.",
-        definitionName
+        type
       );
     }
     validateOADocumentObject(component, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-openapi",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "description": "JavaScript модуль для создания OpenAPI Документа",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -9,10 +9,10 @@
     "openapi",
     "generator"
   ],
-  "homepage": "https://gitrepos.ru/e22m4u/js-openapi",
+  "homepage": "https://gitverse.ru/e22m4u/js-openapi",
   "repository": {
     "type": "git",
-    "url": "git+https://gitrepos.ru/e22m4u/js-openapi.git"
+    "url": "git+https://gitverse.ru/e22m4u/js-openapi.git"
   },
   "type": "module",
   "types": "./src/index.d.ts",
@@ -37,26 +37,25 @@
   },
   "dependencies": {
     "@e22m4u/js-format": "~0.4.0",
-    "@e22m4u/js-service": "~0.5.1",
     "ajv": "~8.18.0",
     "ajv-formats": "~3.0.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "~20.4.2",
-    "@commitlint/config-conventional": "~20.4.2",
+    "@commitlint/cli": "~20.4.4",
+    "@commitlint/config-conventional": "~20.4.4",
     "@eslint/js": "~9.39.2",
     "@types/chai": "~5.2.3",
     "@types/mocha": "~10.0.10",
-    "c8": "~10.1.3",
+    "c8": "~11.0.0",
     "chai": "~6.2.2",
-    "esbuild": "~0.27.3",
+    "esbuild": "~0.27.4",
     "eslint": "~9.39.2",
     "eslint-config-prettier": "~10.1.8",
-    "eslint-plugin-chai-expect": "~3.1.0",
+    "eslint-plugin-chai-expect": "~4.0.0",
     "eslint-plugin-import": "~2.32.0",
-    "eslint-plugin-jsdoc": "~62.7.1",
+    "eslint-plugin-jsdoc": "~62.8.0",
     "eslint-plugin-mocha": "~11.2.0",
-    "globals": "~17.3.0",
+    "globals": "~17.4.0",
     "husky": "~9.1.7",
     "mocha": "~11.7.5",
     "prettier": "~3.8.1",

package/src/errors/oa-document-object-validation-error.d.ts

@@ -7,10 +7,10 @@ export declare class OADocumentObjectValidationError extends Errorf {
   /**
    * Instance path.
    */
-  readonly instancePath?: string;
+  instancePath?: string;
 
   /**
    * Reason.
    */
-  readonly reason?: string;
+  reason?: string;
 }

package/src/oa-document-builder.d.ts

@@ -1,5 +1,4 @@
 import {Optional} from './types.js';
-import {Service, ServiceContainer} from '@e22m4u/js-service';
 
 import {
   OAOperationGroup,
@@ -82,15 +81,7 @@ export type OADocumentInput = Optional<OADocumentObject, 'openapi' | 'info'>;
 /**
  * Document builder.
  */
-export declare class OADocumentBuilder extends Service {
-  /**
-   * Constructor.
-   *
-   * @param container
-   * @param document
-   */
-  constructor(container: ServiceContainer, document?: OADocumentInput);
-
+export declare class OADocumentBuilder {
   /**
    * Constructor.
    *
@@ -98,17 +89,6 @@ export declare class OADocumentBuilder extends Service {
    */
   constructor(document?: OADocumentInput);
 
-  /**
-   * Constructor.
-   *
-   * @param containerOrDocument
-   * @param document
-   */
-  constructor(
-    containerOrDocument?: ServiceContainer | OADocumentInput,
-    document?: OADocumentInput,
-  );
-
   /**
    * Get document object reference.
    */

package/src/oa-document-builder.js

@@ -1,6 +1,5 @@
 import {InvalidArgumentError} from '@e22m4u/js-format';
 import {OAOperationGroup} from './oa-operation-group.js';
-import {isServiceContainer, Service} from '@e22m4u/js-service';
 import {validateOADocumentObject} from './oa-document-object/index.js';
 import {escapeJsonPointer} from './json-pointer/escape-json-pointer.js';
 import {OPENAPI_VERSION, OAOperationMethod} from './oa-specification.js';
@@ -67,7 +66,7 @@ export const OA_COMPONENT_TYPE_TO_DEFINITION_NAME_MAP = {
 /**
  * OpenAPI Document builder.
  */
-export class OADocumentBuilder extends Service {
+export class OADocumentBuilder {
   /**
    * Document.
    *
@@ -86,30 +85,9 @@ export class OADocumentBuilder extends Service {
   /**
    * Constructor.
    *
-   * @param {import('@e22m4u/js-service').ServiceContainer|import('./oa-document-builder.js').OADocumentInput} containerOrDocument
-   * @param {import('./oa-document-builder.js').OADocumentInput} document
+   * @param {import('./oa-document-builder.js').OADocumentInput} [document]
    */
-  constructor(containerOrDocument, document) {
-    if (isServiceContainer(containerOrDocument)) {
-      super(containerOrDocument);
-    } else {
-      super();
-      // containerOrDocument
-      if (containerOrDocument !== undefined) {
-        if (
-          !containerOrDocument ||
-          typeof containerOrDocument !== 'object' ||
-          Array.isArray(containerOrDocument)
-        ) {
-          throw new InvalidArgumentError(
-            'Parameter "containerOrDocument" must be an Object, ' +
-              'but %v was given.',
-            containerOrDocument,
-          );
-        }
-      }
-      document = document === undefined ? containerOrDocument : document;
-    }
+  constructor(document) {
     // document
     if (document !== undefined) {
       if (
@@ -184,7 +162,7 @@ export class OADocumentBuilder extends Service {
     if (!componentsKey) {
       throw new InvalidArgumentError(
         'Component type %v does not have a reference to the components key.',
-        componentsKey,
+        type,
       );
     }
     // definition name
@@ -192,7 +170,7 @@ export class OADocumentBuilder extends Service {
     if (!definitionName) {
       throw new InvalidArgumentError(
         'Component type %v does not have a reference to the definition name.',
-        definitionName,
+        type,
       );
     }
     // validation

package/src/oa-document-builder.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {format} from '@e22m4u/js-format';
-import {ServiceContainer} from '@e22m4u/js-service';
+import {OAOperationGroup} from './oa-operation-group.js';
 import {OADocumentObjectValidationError} from './errors/index.js';
 import {OAComponentType, OADocumentBuilder} from './oa-document-builder.js';
 
@@ -12,7 +12,6 @@ import {
   OASecuritySchemeType,
   OAOperationMethod,
 } from './oa-specification.js';
-import {OAOperationGroup} from './oa-operation-group.js';
 
 describe('OADocumentBuilder', function () {
   describe('constructor', function () {
@@ -20,34 +19,8 @@ describe('OADocumentBuilder', function () {
       new OADocumentBuilder();
     });
 
-    it('should pass the ServiceContainer to the super class', function () {
-      const cont = new ServiceContainer();
-      const S = new OADocumentBuilder(cont);
-      expect(S.container).to.be.eq(cont);
-    });
-
-    it('should require the parameter "containerOrDocument" to be an Object', function () {
-      const throwable = v => () => new OADocumentBuilder(v);
-      const error = s =>
-        format(
-          'Parameter "containerOrDocument" must be an Object, ' +
-            'but %s was given.',
-          s,
-        );
-      expect(throwable('str')).to.throw(error('"str"'));
-      expect(throwable('')).to.throw(error('""'));
-      expect(throwable(10)).to.throw(error('10'));
-      expect(throwable(0)).to.throw(error('0'));
-      expect(throwable(true)).to.throw(error('true'));
-      expect(throwable(false)).to.throw(error('false'));
-      expect(throwable([])).to.throw(error('Array'));
-      expect(throwable(null)).to.throw(error('null'));
-      throwable({})();
-      throwable(undefined)();
-    });
-
     it('should require the parameter "document" to be an Object', function () {
-      const throwable = v => () => new OADocumentBuilder(undefined, v);
+      const throwable = v => () => new OADocumentBuilder(v);
       const error = s =>
         format('Parameter "document" must be an Object, but %s was given.', s);
       expect(throwable('str')).to.throw(error('"str"'));
@@ -62,7 +35,7 @@ describe('OADocumentBuilder', function () {
       throwable(undefined)();
     });
 
-    it('should merge the document from the first parameter with the default document', function () {
+    it('should merge the parameter "document" with the default document', function () {
       const doc = {
         openapi: '3.1.2',
         info: {
@@ -75,19 +48,6 @@ describe('OADocumentBuilder', function () {
       expect(res).to.be.eql({...doc, paths: {}});
     });
 
-    it('should merge the document from the second parameter with the default document', function () {
-      const doc = {
-        openapi: '3.1.2',
-        info: {
-          title: 'My OpenAPI Doc',
-          version: '1.0.0',
-        },
-      };
-      const S = new OADocumentBuilder(undefined, doc);
-      const res = S.getDocumentObjectRef();
-      expect(res).to.be.eql({...doc, paths: {}});
-    });
-
     it('should validate the given document object', function () {
       const doc = {openapi: 'abc'};
       const throwable = () => new OADocumentBuilder(doc);