@swagger-api/apidom-ast 0.92.0 → 0.93.0

package/es/yaml/nodes/predicates.mjs

@@ -1,11 +1,11 @@
 import { isNodeType } from "../../predicates.mjs";
-export const isStream = isNodeType.bind(undefined, 'stream');
-export const isDocument = isNodeType.bind(undefined, 'document');
-export const isMapping = isNodeType.bind(undefined, 'mapping');
-export const isSequence = isNodeType.bind(undefined, 'sequence');
-export const isKeyValuePair = isNodeType.bind(undefined, 'keyValuePair');
-export const isTag = isNodeType.bind(undefined, 'tag');
-export const isScalar = isNodeType.bind(undefined, 'scalar');
-export const isAlias = isNodeType.bind(undefined, 'alias');
-export const isDirective = isNodeType.bind(undefined, 'directive');
-export const isComment = isNodeType.bind(undefined, 'comment');
+export const isStream = node => isNodeType('stream', node);
+export const isDocument = node => isNodeType('document', node);
+export const isMapping = node => isNodeType('mapping', node);
+export const isSequence = node => isNodeType('sequence', node);
+export const isKeyValuePair = node => isNodeType('keyValuePair', node);
+export const isTag = node => isNodeType('tag', node);
+export const isScalar = node => isNodeType('scalar', node);
+export const isAlias = node => isNodeType('alias', node);
+export const isDirective = node => isNodeType('directive', node);
+export const isComment = node => isNodeType('comment', node);

package/es/yaml/schemas/ScalarTag.mjs

@@ -1,37 +1,29 @@
-import stampit from 'stampit';
 import { formatFlowPlain, formatFlowSingleQuoted, formatFlowDoubleQuoted, formatBlockLiteral, formatBlockFolded } from "./canonical-format.mjs";
 import { YamlStyle } from "../nodes/YamlStyle.mjs";
 import { YamlNodeKind } from "../nodes/YamlTag.mjs";
-const ScalarTag = stampit({
-  methods: {
-    test(node) {
-      return node.tag.kind === YamlNodeKind.Scalar && typeof node.content === 'string';
-    },
-    canonicalFormat(node) {
-      let canonicalForm = node.content;
-      const nodeClone = node.clone();
-      if (node.style === YamlStyle.Plain) {
-        // @ts-ignore
-        canonicalForm = formatFlowPlain(node.content);
-      } else if (node.style === YamlStyle.SingleQuoted) {
-        // @ts-ignore
-        canonicalForm = formatFlowSingleQuoted(node.content);
-      } else if (node.style === YamlStyle.DoubleQuoted) {
-        // @ts-ignore
-        canonicalForm = formatFlowDoubleQuoted(node.content);
-      } else if (node.style === YamlStyle.Literal) {
-        // @ts-ignore
-        canonicalForm = formatBlockLiteral(node.content);
-      } else if (node.style === YamlStyle.Folded) {
-        // @ts-ignore
-        canonicalForm = formatBlockFolded(node.content);
-      }
-      nodeClone.content = canonicalForm;
-      return nodeClone;
-    },
-    resolve(node) {
-      return node;
+class ScalarTag {
+  static test(node) {
+    return node.tag.kind === YamlNodeKind.Scalar && typeof node.content === 'string';
+  }
+  static canonicalFormat(node) {
+    let canonicalForm = node.content;
+    const nodeClone = node.clone();
+    if (node.style === YamlStyle.Plain) {
+      canonicalForm = formatFlowPlain(node.content);
+    } else if (node.style === YamlStyle.SingleQuoted) {
+      canonicalForm = formatFlowSingleQuoted(node.content);
+    } else if (node.style === YamlStyle.DoubleQuoted) {
+      canonicalForm = formatFlowDoubleQuoted(node.content);
+    } else if (node.style === YamlStyle.Literal) {
+      canonicalForm = formatBlockLiteral(node.content);
+    } else if (node.style === YamlStyle.Folded) {
+      canonicalForm = formatBlockFolded(node.content);
     }
+    nodeClone.content = canonicalForm;
+    return nodeClone;
+  }
+  static resolve(node) {
+    return node;
   }
-});
+}
 export default ScalarTag;

package/es/yaml/schemas/Tag.mjs

@@ -1,8 +1,19 @@
-import stampit from 'stampit';
-import ScalarTag from "./ScalarTag.mjs";
-const Tag = stampit(ScalarTag, {
-  props: {
-    tag: ''
+/* eslint-disable class-methods-use-this */
+class Tag {
+  static uri = '';
+  tag = '';
+  constructor() {
+    this.tag = this.constructor.uri;
   }
-});
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  test(node) {
+    return true;
+  }
+  resolve(node) {
+    return node;
+  }
+}
+/* eslint-enable class-methods-use-this */
+
 export default Tag;

package/es/yaml/schemas/failsafe/GenericMapping.mjs

@@ -1,23 +1,12 @@
-import stampit from 'stampit';
 import Tag from "../Tag.mjs";
 import { YamlNodeKind } from "../../nodes/YamlTag.mjs";
-const GenericMapping = stampit(Tag, {
-  statics: {
-    uri: 'tag:yaml.org,2002:map'
-  },
-  init(args, {
-    stamp
-  }) {
-    this.tag = stamp.uri;
-  },
-  methods: {
-    test(node) {
-      // @ts-ignore
-      return node.tag.kind === YamlNodeKind.Mapping;
-    },
-    resolve(node) {
-      return node;
-    }
+/* eslint-disable class-methods-use-this */
+class GenericMapping extends Tag {
+  static uri = 'tag:yaml.org,2002:map';
+  test(node) {
+    return node.tag.kind === YamlNodeKind.Mapping;
   }
-});
+}
+/* eslint-enable class-methods-use-this */
+
 export default GenericMapping;

package/es/yaml/schemas/failsafe/GenericSequence.mjs

@@ -1,23 +1,12 @@
-import stampit from 'stampit';
 import Tag from "../Tag.mjs";
 import { YamlNodeKind } from "../../nodes/YamlTag.mjs";
-const GenericSequence = stampit(Tag, {
-  statics: {
-    uri: 'tag:yaml.org,2002:seq'
-  },
-  init(args, {
-    stamp
-  }) {
-    this.tag = stamp.uri;
-  },
-  methods: {
-    test(node) {
-      // @ts-ignore
-      return node.tag.kind === YamlNodeKind.Sequence;
-    },
-    resolve(node) {
-      return node;
-    }
+/* eslint-disable class-methods-use-this */
+class GenericSequence extends Tag {
+  static uri = 'tag:yaml.org,2002:seq';
+  test(node) {
+    return node.tag.kind === YamlNodeKind.Sequence;
   }
-});
+}
+/* eslint-enable class-methods-use-this */
+
 export default GenericSequence;

package/es/yaml/schemas/failsafe/GenericString.mjs

@@ -1,18 +1,5 @@
-import stampit from 'stampit';
 import Tag from "../Tag.mjs";
-const GenericString = stampit(Tag, {
-  statics: {
-    uri: 'tag:yaml.org,2002:str'
-  },
-  init(args, {
-    stamp
-  }) {
-    this.tag = stamp.uri;
-  },
-  methods: {
-    resolve(node) {
-      return node;
-    }
-  }
-});
+class GenericString extends Tag {
+  static uri = 'tag:yaml.org,2002:str';
+}
 export default GenericString;

package/es/yaml/schemas/failsafe/index.mjs

@@ -1,105 +1,99 @@
 import { clone } from 'ramda';
-import stampit from 'stampit';
 import YamlTagError from "../../errors/YamlTagError.mjs";
 import { YamlNodeKind } from "../../nodes/YamlTag.mjs";
-import GenericMapping from "./GenericMapping.mjs";
-import GenericSequence from "./GenericSequence.mjs";
-import GenericString from "./GenericString.mjs";
+import GenericMappingTag from "./GenericMapping.mjs";
+import GenericSequenceTag from "./GenericSequence.mjs";
+import GenericStringTag from "./GenericString.mjs";
 import ScalarTag from "../ScalarTag.mjs";
-const FailsafeSchema = stampit({
-  props: {
-    tags: [],
-    tagDirectives: []
-  },
-  init() {
+class FailsafeSchema {
+  constructor() {
     this.tags = [];
     this.tagDirectives = [];
-    this.registerTag(GenericMapping());
-    this.registerTag(GenericSequence());
-    this.registerTag(GenericString());
-  },
-  methods: {
-    toSpecificTagName(node) {
-      let specificTagName = node.tag.explicitName;
-      if (node.tag.explicitName === '!') {
-        // non-specific tag; we assume tag by kind
-        if (node.tag.kind === YamlNodeKind.Scalar) {
-          // @ts-ignore
-          specificTagName = GenericString.uri;
-        } else if (node.tag.kind === YamlNodeKind.Sequence) {
-          // @ts-ignore
-          specificTagName = GenericSequence.uri;
-        } else if (node.tag.kind === YamlNodeKind.Mapping) {
-          // @ts-ignore
-          specificTagName = GenericMapping.uri;
-        }
-      } else if (node.tag.explicitName.startsWith('!<')) {
-        // verbatim form
-        specificTagName = node.tag.explicitName.replace(/^!</, '').replace(/>$/, '');
-      } else if (node.tag.explicitName.startsWith('!!')) {
-        // shorthand notation
-        specificTagName = `tag:yaml.org,2002:${node.tag.explicitName.replace(/^!!/, '')}`;
-      }
-      return specificTagName;
-    },
-    registerTagDirective(tagDirective) {
-      this.tagDirectives.push({
-        handle: tagDirective.parameters.handle,
-        prefix: tagDirective.parameters.prefix
-      });
-    },
-    registerTag(tag, beginning = false) {
-      if (beginning) {
-        this.tags.unshift(tag);
-      } else {
-        this.tags.push(tag);
+    this.registerTag(new GenericMappingTag());
+    this.registerTag(new GenericSequenceTag());
+    this.registerTag(new GenericStringTag());
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  toSpecificTagName(node) {
+    let specificTagName = node.tag.explicitName;
+    if (node.tag.explicitName === '!') {
+      // non-specific tag; we assume tag by kind
+      if (node.tag.kind === YamlNodeKind.Scalar) {
+        specificTagName = GenericStringTag.uri;
+      } else if (node.tag.kind === YamlNodeKind.Sequence) {
+        specificTagName = GenericSequenceTag.uri;
+      } else if (node.tag.kind === YamlNodeKind.Mapping) {
+        specificTagName = GenericMappingTag.uri;
       }
-      return this;
-    },
-    overrideTag(tag) {
-      this.tags = this.tags.filter(itag => itag.tag === tag.tag);
+    } else if (node.tag.explicitName.startsWith('!<')) {
+      // verbatim form
+      specificTagName = node.tag.explicitName.replace(/^!</, '').replace(/>$/, '');
+    } else if (node.tag.explicitName.startsWith('!!')) {
+      // shorthand notation
+      specificTagName = `tag:yaml.org,2002:${node.tag.explicitName.replace(/^!!/, '')}`;
+    }
+    return specificTagName;
+  }
+  registerTagDirective(tagDirective) {
+    this.tagDirectives.push({
+      // @ts-ignore
+      handle: tagDirective.parameters.handle,
+      // @ts-ignore
+      prefix: tagDirective.parameters.prefix
+    });
+  }
+  registerTag(tag, beginning = false) {
+    if (beginning) {
+      this.tags.unshift(tag);
+    } else {
       this.tags.push(tag);
-      return this;
-    },
-    resolve(node) {
-      const specificTagName = this.toSpecificTagName(node);
+    }
+    return this;
+  }
+  overrideTag(tag) {
+    this.tags = this.tags.filter(itag => itag.tag === tag.tag);
+    this.tags.push(tag);
+    return this;
+  }
+  resolve(node) {
+    const specificTagName = this.toSpecificTagName(node);
 
-      // leave this node unresolved
-      if (specificTagName === '?') {
-        return node;
-      }
+    // leave this node unresolved
+    if (specificTagName === '?') {
+      return node;
+    }
 
-      // turn scalar nodes into canonical format before resolving
-      let canonicalNode = node;
-      if (node.tag.kind === YamlNodeKind.Scalar) {
-        canonicalNode = ScalarTag().canonicalFormat(node);
-      }
-      const tag = this.tags.find(itag => (itag === null || itag === void 0 ? void 0 : itag.tag) === specificTagName);
+    // turn scalar nodes into canonical format before resolving
+    let canonicalNode = node;
+    if (ScalarTag.test(node)) {
+      canonicalNode = ScalarTag.canonicalFormat(node);
+    }
+    const tag = this.tags.find(itag => (itag === null || itag === void 0 ? void 0 : itag.tag) === specificTagName);
 
-      // mechanism for resolving node (tag implementation) not found
-      if (typeof tag === 'undefined') {
-        throw new YamlTagError(`Tag "${specificTagName}" was not recognized.`, {
-          specificTagName,
-          explicitTagName: node.tag.explicitName,
-          tagKind: node.tag.kind,
-          tagPosition: clone(node.tag.position),
-          node: node.clone()
-        });
-      }
+    // mechanism for resolving node (tag implementation) not found
+    if (typeof tag === 'undefined') {
+      throw new YamlTagError(`Tag "${specificTagName}" was not recognized.`, {
+        specificTagName,
+        explicitTagName: node.tag.explicitName,
+        tagKind: node.tag.kind,
+        tagPosition: clone(node.tag.position),
+        node: node.clone()
+      });
+    }
 
-      // node content is not compatible with resolving mechanism (tag implementation)
-      if (!tag.test(canonicalNode)) {
-        throw new YamlTagError(`Node couldn't be resolved against the tag "${specificTagName}"`, {
-          specificTagName,
-          explicitTagName: node.tag.explicitName,
-          tagKind: node.tag.kind,
-          tagPosition: clone(node.tag.position),
-          nodeCanonicalContent: canonicalNode.content,
-          node: node.clone()
-        });
-      }
-      return tag.resolve(canonicalNode);
+    // node content is not compatible with resolving mechanism (tag implementation)
+    if (!tag.test(canonicalNode)) {
+      throw new YamlTagError(`Node couldn't be resolved against the tag "${specificTagName}"`, {
+        specificTagName,
+        explicitTagName: node.tag.explicitName,
+        tagKind: node.tag.kind,
+        tagPosition: clone(node.tag.position),
+        nodeCanonicalContent: canonicalNode.content,
+        node: node.clone()
+      });
     }
+    return tag.resolve(canonicalNode);
   }
-});
+}
 export default FailsafeSchema;

package/es/yaml/schemas/json/Boolean.mjs

@@ -1,24 +1,17 @@
-import stampit from 'stampit';
 import Tag from "../Tag.mjs";
-const Boolean = stampit(Tag, {
-  statics: {
-    uri: 'tag:yaml.org,2002:bool'
-  },
-  init(args, {
-    stamp
-  }) {
-    this.tag = stamp.uri;
-  },
-  methods: {
-    test(node) {
-      return /^(true|false)$/.test(node.content);
-    },
-    resolve(node) {
-      const content = node.content === 'true';
-      const nodeClone = node.clone();
-      nodeClone.content = content;
-      return nodeClone;
-    }
+/* eslint-disable class-methods-use-this */
+class Boolean extends Tag {
+  static uri = 'tag:yaml.org,2002:bool';
+  test(node) {
+    return /^(true|false)$/.test(node.content);
   }
-});
+  resolve(node) {
+    const content = node.content === 'true';
+    const nodeClone = node.clone();
+    nodeClone.content = content;
+    return nodeClone;
+  }
+}
+/* eslint-enable class-methods-use-this */
+
 export default Boolean;

package/es/yaml/schemas/json/FloatingPoint.mjs

@@ -1,24 +1,17 @@
-import stampit from 'stampit';
 import Tag from "../Tag.mjs";
-const FloatingPoint = stampit(Tag, {
-  statics: {
-    uri: 'tag:yaml.org,2002:float'
-  },
-  init(args, {
-    stamp
-  }) {
-    this.tag = stamp.uri;
-  },
-  methods: {
-    test(node) {
-      return /^-?(0|[1-9][0-9]*)(\.[0-9]*)?([eE][-+]?[0-9]+)?$/.test(node.content);
-    },
-    resolve(node) {
-      const content = parseFloat(node.content);
-      const nodeClone = node.clone();
-      nodeClone.content = content;
-      return nodeClone;
-    }
+/* eslint-disable class-methods-use-this */
+class FloatingPoint extends Tag {
+  static uri = 'tag:yaml.org,2002:float';
+  test(node) {
+    return /^-?(0|[1-9][0-9]*)(\.[0-9]*)?([eE][-+]?[0-9]+)?$/.test(node.content);
   }
-});
+  resolve(node) {
+    const content = parseFloat(node.content);
+    const nodeClone = node.clone();
+    nodeClone.content = content;
+    return nodeClone;
+  }
+}
+/* eslint-enable class-methods-use-this */
+
 export default FloatingPoint;

package/es/yaml/schemas/json/Integer.mjs

@@ -1,24 +1,17 @@
-import stampit from 'stampit';
 import Tag from "../Tag.mjs";
-const Integer = stampit(Tag, {
-  statics: {
-    uri: 'tag:yaml.org,2002:int'
-  },
-  init(args, {
-    stamp
-  }) {
-    this.tag = stamp.uri;
-  },
-  methods: {
-    test(node) {
-      return /^-?(0|[1-9][0-9]*)$/.test(node.content);
-    },
-    resolve(node) {
-      const content = parseInt(node.content, 10);
-      const nodeClone = node.clone();
-      nodeClone.content = content;
-      return nodeClone;
-    }
+/* eslint-disable class-methods-use-this */
+class Integer extends Tag {
+  static uri = 'tag:yaml.org,2002:int';
+  test(node) {
+    return /^-?(0|[1-9][0-9]*)$/.test(node.content);
   }
-});
+  resolve(node) {
+    const content = parseInt(node.content, 10);
+    const nodeClone = node.clone();
+    nodeClone.content = content;
+    return nodeClone;
+  }
+}
+/* eslint-enable class-methods-use-this */
+
 export default Integer;

package/es/yaml/schemas/json/Null.mjs

@@ -1,23 +1,16 @@
-import stampit from 'stampit';
 import Tag from "../Tag.mjs";
-const Null = stampit(Tag, {
-  statics: {
-    uri: 'tag:yaml.org,2002:null'
-  },
-  init(args, {
-    stamp
-  }) {
-    this.tag = stamp.uri;
-  },
-  methods: {
-    test(node) {
-      return /^null$/.test(node.content);
-    },
-    resolve(node) {
-      const nodeClone = node.clone();
-      nodeClone.content = null;
-      return nodeClone;
-    }
+/* eslint-disable class-methods-use-this */
+class Null extends Tag {
+  static uri = 'tag:yaml.org,2002:null';
+  test(node) {
+    return /^null$/.test(node.content);
   }
-});
+  resolve(node) {
+    const nodeClone = node.clone();
+    nodeClone.content = null;
+    return nodeClone;
+  }
+}
+/* eslint-enable class-methods-use-this */
+
 export default Null;

package/es/yaml/schemas/json/index.mjs

@@ -1,41 +1,35 @@
-import stampit from 'stampit';
 import FailsafeSchema from "../failsafe/index.mjs";
-import Boolean from "./Boolean.mjs";
-import FloatingPoint from "./FloatingPoint.mjs";
-import Integer from "./Integer.mjs";
-import Null from "./Null.mjs";
+import BooleanTag from "./Boolean.mjs";
+import FloatingPointTag from "./FloatingPoint.mjs";
+import IntegerTag from "./Integer.mjs";
+import NullTag from "./Null.mjs";
 import { YamlNodeKind } from "../../nodes/YamlTag.mjs";
 import GenericSequence from "../failsafe/GenericSequence.mjs";
 import GenericMapping from "../failsafe/GenericMapping.mjs";
-const JsonSchema = stampit(FailsafeSchema, {
-  init() {
+class JsonSchema extends FailsafeSchema {
+  constructor() {
+    super();
     /**
      * We're registering more specific tags before more generic ones from Failsafe schema.
      */
-    this.registerTag(Boolean(), true);
-    this.registerTag(FloatingPoint(), true);
-    this.registerTag(Integer(), true);
-    this.registerTag(Null(), true);
-  },
-  methods: {
-    toSpecificTagName(node) {
-      // @ts-ignore
-      let specificTagName = FailsafeSchema.compose.methods.toSpecificTagName.call(this, node);
-      if (specificTagName === '?') {
-        if (node.tag.vkind === YamlNodeKind.Sequence) {
-          // @ts-ignore
-          specificTagName = GenericSequence.uri;
-        } else if (node.tag.kind === YamlNodeKind.Mapping) {
-          // @ts-ignore
-          specificTagName = GenericMapping.uri;
-        } else if (node.tag.kind === YamlNodeKind.Scalar) {
-          // @ts-ignore
-          const foundTag = this.tags.find(tag => tag.test(node));
-          specificTagName = (foundTag === null || foundTag === void 0 ? void 0 : foundTag.tag) || '?';
-        }
+    this.registerTag(new BooleanTag(), true);
+    this.registerTag(new FloatingPointTag(), true);
+    this.registerTag(new IntegerTag(), true);
+    this.registerTag(new NullTag(), true);
+  }
+  toSpecificTagName(node) {
+    let specificTagName = super.toSpecificTagName(node);
+    if (specificTagName === '?') {
+      if (node.tag.vkind === YamlNodeKind.Sequence) {
+        specificTagName = GenericSequence.uri;
+      } else if (node.tag.kind === YamlNodeKind.Mapping) {
+        specificTagName = GenericMapping.uri;
+      } else if (node.tag.kind === YamlNodeKind.Scalar) {
+        const foundTag = this.tags.find(tag => tag.test(node));
+        specificTagName = (foundTag === null || foundTag === void 0 ? void 0 : foundTag.tag) || '?';
       }
-      return specificTagName;
     }
+    return specificTagName;
   }
-});
+}
 export default JsonSchema;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-ast",
-  "version": "0.92.0",
+  "version": "0.93.0",
   "description": "Tools necessary for parsing stage of ApiDOM, specifically for syntactic analysis.",
   "publishConfig": {
     "access": "public",
@@ -42,11 +42,10 @@
   "homepage": "https://github.com/swagger-api/apidom#readme",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-error": "^0.92.0",
+    "@swagger-api/apidom-error": "^0.93.0",
     "@types/ramda": "~0.29.6",
     "ramda": "~0.29.1",
     "ramda-adjunct": "^4.1.1",
-    "stampit": "^4.3.2",
     "unraw": "^3.0.0"
   },
   "files": [
@@ -59,5 +58,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "c7a45ee8d68ac82ac2ab93ebb639a95ced1d6e86"
+  "gitHead": "65ea9068f5d8b144293c2f91eb5fe5ebacfd947c"
 }