@larsgw/formica 0.6.5 → 0.6.6

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.6.6](https://github.com/identification-resources/formica/compare/v0.6.5...v0.6.6) (2025-02-16)
+
+
+### Features
+
+* **resources:** allow other resources in version_of ([85947b0](https://github.com/identification-resources/formica/commit/85947b0dcfbdb4bfd6537c628b34087a6e6326f7))
+
+
+
 ## [0.6.5](https://github.com/identification-resources/formica/compare/v0.6.4...v0.6.5) (2024-12-20)
 
 

package/lib/resources/parse-text.js

@@ -13,7 +13,7 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseFileHeader = exports.parseFile = void 0;
 var yaml = require("js-yaml");
-var work_1 = require("../catalog/tables/work");
+var resource_1 = require("./resource");
 var diff_resource_1 = require("./diff-resource");
 var RANKS = [
     'phylum',
@@ -370,6 +370,9 @@ function parseHeader(header) {
     var metadata = { levels: levels };
     if ('catalog' in config && typeof config.catalog === 'object' && config.catalog !== null) {
         var catalog = {};
+        if ('id' in config.catalog) {
+            throw new SyntaxError('"catalog" should not contain id');
+        }
         for (var key in config.catalog) {
             var value = config.catalog[key];
             if (typeof value === 'number') {
@@ -382,7 +385,7 @@ function parseHeader(header) {
                 throw new SyntaxError("\"catalog\" should contain only strings (\"".concat(key, "\")"));
             }
         }
-        var work = new work_1.Work(catalog);
+        var work = new resource_1.WorkResource(catalog);
         var errors = work.validate().filter(function (_a) {
             var error = _a.error;
             return error !== 'Value(s) required but missing';

package/lib/resources/resource.d.ts

@@ -0,0 +1,4 @@
+import { Work } from '../catalog/tables/work';
+export declare class WorkResource extends Work {
+    constructor(values: Record<string, string>);
+}

package/lib/resources/resource.js

@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkResource = void 0;
+var work_1 = require("../catalog/tables/work");
+var WorkResource = /** @class */ (function (_super) {
+    __extends(WorkResource, _super);
+    function WorkResource(values) {
+        var _this = _super.call(this, values) || this;
+        _this.schema.version_of.format = /^B[1-9]\d*:[1-9]\d*$/;
+        _this.schema.duplicate_of.format = /^B[1-9]\d*:[1-9]\d*$/;
+        return _this;
+    }
+    return WorkResource;
+}(work_1.Work));
+exports.WorkResource = WorkResource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@larsgw/formica",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "SDK and tools for data from the Library of Identification Resources",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -16,7 +16,7 @@
     "lint": "eslint src",
     "build": "tsc -d",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "preversion": "npm run lint",
+    "preversion": "npm run lint && npm test",
     "version": "npm run changelog && git add CHANGELOG.md",
     "prepublishOnly": "npm run build"
   },

package/src/resources/parse-text.ts

@@ -1,5 +1,5 @@
 import * as yaml from 'js-yaml'
-import { Work } from '../catalog/tables/work'
+import { WorkResource } from './resource'
 import { createDiff, ResourceDiffType } from './diff-resource'
 
 const RANKS: Rank[] = [
@@ -394,6 +394,9 @@ function parseHeader (header: string): ResourceMetadata {
 
     if ('catalog' in config && typeof config.catalog === 'object' && config.catalog !== null) {
         const catalog: Record<string, string> = {}
+        if ('id' in config.catalog) {
+            throw new SyntaxError('"catalog" should not contain id')
+        }
         for (const key in config.catalog) {
             const value = config.catalog[key as keyof object]
             if (typeof value === 'number') {
@@ -404,7 +407,7 @@ function parseHeader (header: string): ResourceMetadata {
                 throw new SyntaxError(`"catalog" should contain only strings ("${key}")`)
             }
         }
-        const work = new Work(catalog)
+        const work = new WorkResource(catalog)
         const errors = work.validate().filter(({ error }) => error !== 'Value(s) required but missing')
         if (errors.length > 0) {
             throw new SyntaxError(`"catalog" contains errors: ${errors.map(({ field, error }) => `[${field}] ${error}`).join('; ')}`)

package/src/resources/resource.ts

@@ -0,0 +1,10 @@
+import { Work } from '../catalog/tables/work'
+
+export class WorkResource extends Work {
+    constructor (values: Record<string, string>) {
+        super(values)
+
+        this.schema.version_of.format = /^B[1-9]\d*:[1-9]\d*$/
+        this.schema.duplicate_of.format = /^B[1-9]\d*:[1-9]\d*$/
+    }
+}