@metriport/shared 0.4.5 → 0.4.7

package/dist/common/__tests__/normalize-oid.test.js

@@ -2,23 +2,53 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const normalize_oid_1 = require("../normalize-oid");
 const shorterValidOid = "1";
+const shorterInvalidOid = "1000";
 const validOid = "1.22.333.444";
 const longerValidOid = "1.22.33.444.555.6677.889999.0001";
 const validOidWithPrefix = "urn:oid:1.22.333.444";
 const invalidOid = "notAnOid";
 const consecutiveDotsInvalidOid = "1.22.333..444";
+const validOidWithTrailingString = "1.22.333.444SomeJunk";
+const oidWithLeadingAndTrailingJunk = "SomeJunk1.22.333.444SomeJunk";
+const oidWithLeadingZeros = "1.02.003.0004";
+const emptyString = "";
+const onlyDots = "...";
+const leadingDots = ".1.22.333.444";
+const multipleLeadingDots = "..1.22.333.444";
+const rootBoundaryZero = "0.1.2";
+const rootBoundaryTwo = "2.999.999";
 describe("normalizeOid", () => {
     it("should return the same oid if it is already valid", () => {
         expect((0, normalize_oid_1.normalizeOid)(validOid)).toBe(validOid);
         expect((0, normalize_oid_1.normalizeOid)(shorterValidOid)).toBe(shorterValidOid);
         expect((0, normalize_oid_1.normalizeOid)(longerValidOid)).toBe(longerValidOid);
     });
-    it("should return the oid without the urn:oid: prefix", () => {
+    it("should return the oid without the junk surrounding it", () => {
         expect((0, normalize_oid_1.normalizeOid)(validOidWithPrefix)).toBe(validOid);
+        expect((0, normalize_oid_1.normalizeOid)(validOidWithTrailingString)).toBe(validOid);
     });
     it("should throw an error if oid does not conform to the format", () => {
         expect(() => (0, normalize_oid_1.normalizeOid)(invalidOid)).toThrow("OID is not valid");
         expect(() => (0, normalize_oid_1.normalizeOid)(consecutiveDotsInvalidOid)).toThrow("OID is not valid");
+        expect(() => (0, normalize_oid_1.normalizeOid)(shorterInvalidOid)).toThrow("OID is not valid");
+    });
+    it("should return the oid without leading and trailing junk", () => {
+        expect((0, normalize_oid_1.normalizeOid)(oidWithLeadingAndTrailingJunk)).toBe(validOid);
+    });
+    it("should correctly handle OIDs with leading zeros", () => {
+        expect((0, normalize_oid_1.normalizeOid)(oidWithLeadingZeros)).toBe(oidWithLeadingZeros);
+    });
+    it("should throw an error for empty string or only dots", () => {
+        expect(() => (0, normalize_oid_1.normalizeOid)(emptyString)).toThrow("OID is not valid");
+        expect(() => (0, normalize_oid_1.normalizeOid)(onlyDots)).toThrow("OID is not valid");
+    });
+    it("should throw an error for leading dots", () => {
+        expect(() => (0, normalize_oid_1.normalizeOid)(leadingDots)).toThrow("OID is not valid");
+        expect(() => (0, normalize_oid_1.normalizeOid)(multipleLeadingDots)).toThrow("OID is not valid");
+    });
+    it("should handle root code boundary conditions", () => {
+        expect((0, normalize_oid_1.normalizeOid)(rootBoundaryZero)).toBe(rootBoundaryZero);
+        expect((0, normalize_oid_1.normalizeOid)(rootBoundaryTwo)).toBe(rootBoundaryTwo);
     });
 });
 //# sourceMappingURL=normalize-oid.test.js.map

package/dist/common/__tests__/normalize-oid.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-oid.test.js","sourceRoot":"","sources":["../../../src/common/__tests__/normalize-oid.test.ts"],"names":[],"mappings":";;AAAA,oDAAgD;AAEhD,MAAM,eAAe,GAAG,GAAG,CAAC;AAC5B,MAAM,QAAQ,GAAG,cAAc,CAAC;AAChC,MAAM,cAAc,GAAG,kCAAkC,CAAC;AAC1D,MAAM,kBAAkB,GAAG,sBAAsB,CAAC;AAClD,MAAM,UAAU,GAAG,UAAU,CAAC;AAC9B,MAAM,yBAAyB,GAAG,eAAe,CAAC;AAElD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,CAAC,IAAA,4BAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,CAAC,IAAA,4BAAY,EAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,CAAC,IAAA,4BAAY,EAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,CAAC,IAAA,4BAAY,EAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,4BAAY,EAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACnE,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,4BAAY,EAAC,yBAAyB,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"normalize-oid.test.js","sourceRoot":"","sources":["../../../src/common/__tests__/normalize-oid.test.ts"],"names":[],"mappings":"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"}

package/dist/common/normalize-oid.d.ts

@@ -1,2 +1,2 @@
-export declare function normalizeOid(oid: string): string;
+export declare function normalizeOid(input: string): string;
 //# sourceMappingURL=normalize-oid.d.ts.map

package/dist/common/normalize-oid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-oid.d.ts","sourceRoot":"","sources":["../../src/common/normalize-oid.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOhD"}
+{"version":3,"file":"normalize-oid.d.ts","sourceRoot":"","sources":["../../src/common/normalize-oid.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAYlD"}

package/dist/common/normalize-oid.js

@@ -1,13 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOid = void 0;
-const OID_REGEX = /^(urn:oid:)?([0-9]+(\.[0-9]+)*)$/;
-function normalizeOid(oid) {
-    const match = OID_REGEX.exec(oid);
-    if (match && match[2]) {
-        return match[2];
+const OID_REGEX = /(?:[^.\d]*)((([0-9]*)(?:\.*))*)*(?:[^.\d]*)/;
+function normalizeOid(input) {
+    const match = input.match(OID_REGEX);
+    // The OID should not contain "..". If it does, it is not a valid OID.
+    // The root of OID must be 0, 1 or 2. If it is not, it is not a valid OID. (i.e. '1000' is not a valid OID)
+    if (match && match[1]) {
+        const oidCandidate = match[1];
+        if (!oidCandidate.includes("..") && startsWithRootCode(oidCandidate)) {
+            return oidCandidate;
+        }
     }
     throw new Error("OID is not valid");
 }
 exports.normalizeOid = normalizeOid;
+function startsWithRootCode(oid) {
+    if (oid.includes(".")) {
+        const root = oid.split(".")[0];
+        if (root) {
+            const rootInt = parseInt(root);
+            return isWithinRootBounds(rootInt) ?? false;
+        }
+    }
+    else {
+        return isWithinRootBounds(parseInt(oid));
+    }
+    return false;
+}
+function isWithinRootBounds(root) {
+    return root >= 0 && root <= 2;
+}
 //# sourceMappingURL=normalize-oid.js.map

package/dist/common/normalize-oid.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-oid.js","sourceRoot":"","sources":["../../src/common/normalize-oid.ts"],"names":[],"mappings":";;;AAAA,MAAM,SAAS,GAAG,kCAAkC,CAAC;AAErD,SAAgB,YAAY,CAAC,GAAW;IACtC,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;QACrB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;AACtC,CAAC;AAPD,oCAOC"}
+{"version":3,"file":"normalize-oid.js","sourceRoot":"","sources":["../../src/common/normalize-oid.ts"],"names":[],"mappings":";;;AAAA,MAAM,SAAS,GAAG,6CAA6C,CAAC;AAEhE,SAAgB,YAAY,CAAC,KAAa;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACrC,sEAAsE;IACtE,2GAA2G;IAC3G,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;QACrB,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,YAAY,CAAC,EAAE;YACpE,OAAO,YAAY,CAAC;SACrB;KACF;IAED,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;AACtC,CAAC;AAZD,oCAYC;AAED,SAAS,kBAAkB,CAAC,GAAW;IACrC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,IAAI,EAAE;YACR,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/B,OAAO,kBAAkB,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;SAC7C;KACF;SAAM;QACL,OAAO,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;KAC1C;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;AAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metriport/shared",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "Common code shared across packages - by Metriport Inc.",
   "author": "Metriport Inc. <contact@metriport.com>",
   "homepage": "https://metriport.com/",
@@ -51,5 +51,5 @@
     "test": "jest --runInBand --detectOpenHandles --passWithNoTests",
     "test:e2e": "E2E=true jest --runInBand --detectOpenHandles --passWithNoTests"
   },
-  "gitHead": "efce016368a2d425727dd955c6d04ae09ce1cc0e"
+  "gitHead": "8c8068ce480f80ff0b7fad61097bbc8b5b63012d"
 }