justus 0.5.0 → 0.5.2

package/dist/dts-generator.mjs

@@ -1,7 +1,9 @@
 // dts-generator.ts
 import ts from "typescript";
 import { assertSchema } from "./errors.mjs";
+import { EAN13Validator } from "./extra/ean13.mjs";
 import { URLValidator } from "./extra/url.mjs";
+import { UUIDValidator } from "./extra/uuid.mjs";
 import { getValidator } from "./utilities.mjs";
 import { AnyValidator } from "./validators/any.mjs";
 import { AnyArrayValidator, ArrayValidator } from "./validators/array.mjs";
@@ -15,45 +17,231 @@ import { OptionalValidator } from "./validators/optional.mjs";
 import { AnyStringValidator, StringValidator } from "./validators/string.mjs";
 import { TupleValidator } from "./validators/tuple.mjs";
 import { AllOfValidator, OneOfValidator } from "./validators/union.mjs";
+function typeEqual(a, b) {
+  function eq(a2, b2) {
+    if (typeof a2 == "object" && a2 != null && (typeof b2 == "object" && b2 != null)) {
+      for (const key in a2) {
+        if (!eq(a2[key], b2[key]))
+          return false;
+      }
+      for (const key in b2) {
+        if (!eq(a2[key], b2[key]))
+          return false;
+      }
+      return true;
+    } else {
+      return a2 === b2;
+    }
+  }
+  return eq(a, b);
+}
 var generators = /* @__PURE__ */ new Map();
 function registerTypeGenerator(validator, generator) {
   generators.set(validator, generator);
 }
-function generateTypes(validations) {
+function generateTypes(validations, isInput = false) {
   const validators = /* @__PURE__ */ new Map();
   const references = /* @__PURE__ */ new Map();
-  Object.entries(validations).forEach(([name, validation]) => {
+  for (const [name, validation] of Object.entries(validations)) {
     const validator = getValidator(validation);
+    validators.set(name, validator);
     if (!references.has(validator))
       references.set(validator, name);
-    validators.set(name, validator);
-  });
-  const types = [];
-  for (const [name, validator] of validators.entries()) {
-    const referenceable = new Map(references);
-    if (referenceable.get(validator) === name) {
-      referenceable.delete(validator);
-    }
-    const type = generateTypeNode(validator, referenceable);
-    const modifiers = [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)];
-    const decl = ts.factory.createTypeAliasDeclaration(modifiers, name, [], type);
-    types.push(decl);
+  }
+  const types = generateTypeNodes(validators, references, isInput);
+  const aliases = [];
+  for (const [name, type] of types.entries()) {
+    const alias = ts.factory.createTypeAliasDeclaration(exportModifiers, name, [], type);
+    aliases.push(alias);
   }
   return ts.createPrinter().printList(
     ts.ListFormat.SourceFileStatements,
-    ts.factory.createNodeArray(types),
+    ts.factory.createNodeArray(aliases),
+    ts.createSourceFile("types.d.ts", "", ts.ScriptTarget.Latest)
+  );
+}
+function generateDeclarations(validations) {
+  const names = [];
+  const outputValidators = /* @__PURE__ */ new Map();
+  const outputReferences = /* @__PURE__ */ new Map();
+  const inputValidators = /* @__PURE__ */ new Map();
+  const inputReferences = /* @__PURE__ */ new Map();
+  for (const [name, validation] of Object.entries(validations)) {
+    const prefix = /validator$/i.test(name) ? name.slice(0, -9) : /validation$/i.test(name) ? name.slice(0, -10) : name;
+    const output = `${prefix.slice(0, 1).toUpperCase()}${prefix.slice(1)}`;
+    const input = `${prefix.slice(0, 1).toUpperCase()}${prefix.slice(1)}Input`;
+    const validator = getValidator(validation);
+    names.push({ name, output, input });
+    outputValidators.set(output, validator);
+    inputValidators.set(input, validator);
+    if (!outputReferences.has(validator))
+      outputReferences.set(validator, output);
+    if (!inputReferences.has(validator))
+      inputReferences.set(validator, input);
+  }
+  const outputTypes = generateTypeNodes(outputValidators, outputReferences, false);
+  const inputTypes = generateTypeNodes(inputValidators, inputReferences, true);
+  const statements = [];
+  for (const { name, input, output } of names) {
+    const outputType = outputTypes.get(output);
+    const inputType = inputTypes.get(input);
+    const validation = validations[name];
+    const validator = outputValidators.get(output);
+    assertSchema(!!outputType, `No output type "${output}" generated for validation "${name}"`);
+    assertSchema(!!inputType, `No input type "${input}" generated for validation "${name}"`);
+    assertSchema(!!validator, `No validator for "${name}"`);
+    const sameType = typeEqual(inputType, outputType);
+    const inputAlias = sameType ? ts.factory.createTypeReferenceNode(output) : inputType;
+    const outputDeclaration = ts.factory.createTypeAliasDeclaration(exportModifiers, output, [], outputType);
+    const inputDeclaration = ts.factory.createTypeAliasDeclaration(exportModifiers, input, [], inputAlias);
+    const variableDeclarationType = generateVariableDeclarationType(validation, validator, outputReferences);
+    const variableDeclaration = ts.factory.createVariableStatement(
+      exportModifiers,
+      // "export"
+      ts.factory.createVariableDeclarationList([
+        ts.factory.createVariableDeclaration(
+          name,
+          // ..................................... "myTypeValidator"
+          void 0,
+          // no exclamation token
+          variableDeclarationType
+        )
+      ], ts.NodeFlags.Const)
+      // ......................... "const"
+    );
+    ts.addSyntheticLeadingComment(
+      outputDeclaration,
+      ts.SyntaxKind.MultiLineCommentTrivia,
+      ` ${`----- ${name} `.padEnd(74, "-")} `,
+      true
+      // newline
+    );
+    ts.addSyntheticLeadingComment(
+      outputDeclaration,
+      ts.SyntaxKind.MultiLineCommentTrivia,
+      `* Validated type for {@link ${name}} `,
+      true
+      // newline
+    );
+    ts.addSyntheticLeadingComment(
+      inputDeclaration,
+      ts.SyntaxKind.MultiLineCommentTrivia,
+      `* Input type for {@link ${name}} `,
+      true
+      // newline
+    );
+    ts.addSyntheticLeadingComment(
+      variableDeclaration,
+      ts.SyntaxKind.MultiLineCommentTrivia,
+      `* The \`${name}\` validator `,
+      true
+      // newline
+    );
+    statements.push(
+      outputDeclaration,
+      inputDeclaration,
+      variableDeclaration
+    );
+  }
+  const dts = ts.createPrinter().printList(
+    ts.ListFormat.SourceFileStatements,
+    ts.factory.createNodeArray(statements),
     ts.createSourceFile("types.d.ts", "", ts.ScriptTarget.Latest)
   );
+  return `// Generated on ${(/* @__PURE__ */ new Date()).toUTCString()}
+
+${dts}`;
+}
+function isValidator(validation) {
+  assertSchema(validation !== void 0, 'Found "undefined" validation in tree');
+  if (validation === null)
+    return false;
+  if (typeof validation !== "function" && typeof validation !== "object") {
+    return false;
+  }
+  if (Array.isArray(validation))
+    return false;
+  if ("validate" in validation && typeof validation.validate === "function") {
+    return !isValidator(validation.validate);
+  } else {
+    return false;
+  }
+}
+function generateJustusTypeImport(typeName, typeArguments = []) {
+  return ts.factory.createImportTypeNode(
+    // .................... "import"
+    ts.factory.createLiteralTypeNode(
+      ts.factory.createStringLiteral("justus")
+      // .......... "justus"
+    ),
+    void 0,
+    // import assertions
+    ts.factory.createIdentifier(typeName),
+    // ................. "JustusType"
+    typeArguments
+  );
+}
+function generateVariableDeclarationType(validation, validator, references) {
+  if (isValidator(validation)) {
+    const validatedType = generateTypeNode(validator, references, false);
+    return generateJustusTypeImport("Validator", [validatedType]);
+  }
+  if (validator instanceof ConstantValidator) {
+    return generateTypeNode(validator, references, false);
+  }
+  if (validator instanceof ObjectValidator) {
+    const properties = [];
+    for (const [key, valueValidator] of validator.validators.entries()) {
+      const value = validator.schema[key];
+      const type = generateVariableDeclarationType(value, valueValidator, references);
+      properties.push(ts.factory.createPropertySignature(
+        readonlyModifiers,
+        key,
+        void 0,
+        // no question mark
+        type
+      ));
+    }
+    if (validator.additionalProperties) {
+      const additional = validator.additionalProperties;
+      const type = generateVariableDeclarationType(additional, additional, references);
+      properties.push(ts.factory.createPropertySignature(
+        readonlyModifiers,
+        ts.factory.createComputedPropertyName(
+          ts.factory.createPropertyAccessExpression(
+            ts.factory.createIdentifier("Symbol"),
+            "justusAdditionalValidator"
+          )
+        ),
+        void 0,
+        // no question mark
+        type
+      ));
+    }
+    return ts.factory.createTypeLiteralNode(properties);
+  }
+  assertSchema(false, `Unable to generate variable declaration for ${validator.constructor.name}`);
 }
-function generateTypeNode(validator, references) {
+function generateTypeNodes(validators, references, isInput) {
+  const types = /* @__PURE__ */ new Map();
+  for (const [name, validator] of validators.entries()) {
+    const referenceable = new Map(references);
+    if (referenceable.get(validator) === name)
+      referenceable.delete(validator);
+    types.set(name, generateTypeNode(validator, referenceable, isInput));
+  }
+  return types;
+}
+function generateTypeNode(validator, references, isInput) {
   const reference = references.get(validator);
   if (reference)
     return ts.factory.createTypeReferenceNode(reference);
   const generator = generators.get(validator) || generators.get(validator.constructor);
   assertSchema(!!generator, `Type generator for "${validator.constructor.name}" not found`);
-  const type = generator(validator, references);
-  if (!validator.optional)
+  const type = generator(validator, references, isInput);
+  if (!(validator.optional || isInput && validator.defaultValue !== void 0)) {
     return type;
+  }
   if (type === neverType)
     return undefinedType;
   if (ts.isUnionTypeNode(type)) {
@@ -64,6 +252,7 @@ function generateTypeNode(validator, references) {
 var anyType = ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword);
 var anyArrayType = ts.factory.createArrayTypeNode(anyType);
 var booleanType = ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
+var dateType = ts.factory.createTypeReferenceNode("Date");
 var numberType = ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
 var neverType = ts.factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword);
 var stringType = ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
@@ -81,42 +270,54 @@ var recordType = ts.factory.createMappedTypeNode(
   void 0
 );
 var optionalKeyword = ts.factory.createToken(ts.SyntaxKind.QuestionToken);
+var exportModifiers = [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)];
+var readonlyModifiers = [ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)];
 registerTypeGenerator(AnyValidator, () => anyType);
 registerTypeGenerator(AnyArrayValidator, () => anyArrayType);
 registerTypeGenerator(AnyNumberValidator, () => numberType);
 registerTypeGenerator(AnyObjectValidator, () => recordType);
 registerTypeGenerator(AnyStringValidator, () => stringType);
-registerTypeGenerator(BooleanValidator, () => booleanType);
 registerTypeGenerator(NeverValidator, () => neverType);
-registerTypeGenerator(DateValidator, () => ts.factory.createTypeReferenceNode("Date"));
-registerTypeGenerator(URLValidator, () => ts.factory.createTypeReferenceNode("URL"));
-registerTypeGenerator(ArrayValidator, (validator, references) => {
-  const itemType = generateTypeNode(validator.items, references);
+registerTypeGenerator(ArrayValidator, (validator, references, isInput) => {
+  const itemType = generateTypeNode(validator.items, references, isInput);
   return ts.factory.createArrayTypeNode(itemType);
 });
+registerTypeGenerator(BooleanValidator, (validator, _references, isInput) => {
+  return isInput && validator.fromString ? ts.factory.createUnionTypeNode([
+    booleanType,
+    ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral("true")),
+    ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral("false"))
+  ]) : booleanType;
+});
 registerTypeGenerator(ConstantValidator, (validator) => {
   const literal = typeof validator.constant === "number" ? ts.factory.createNumericLiteral(validator.constant) : typeof validator.constant === "string" ? ts.factory.createStringLiteral(validator.constant) : validator.constant === false ? ts.factory.createFalse() : validator.constant === true ? ts.factory.createTrue() : validator.constant === null ? ts.factory.createNull() : void 0;
   assertSchema(!!literal, `Invalid constant "${validator.constant}"`);
   return ts.factory.createLiteralTypeNode(literal);
 });
-registerTypeGenerator(NumberValidator, (validator) => {
+registerTypeGenerator(DateValidator, (validator, _references, isInput) => {
+  return isInput ? validator.format === "iso" ? stringType : validator.format === "timestamp" ? numberType : ts.factory.createUnionTypeNode([dateType, numberType, stringType]) : dateType;
+});
+registerTypeGenerator(NumberValidator, (validator, _references, isInput) => {
+  if (isInput) {
+    return validator.fromString ? ts.factory.createUnionTypeNode([numberType, stringType]) : numberType;
+  }
   if (!validator.brand)
     return numberType;
   const signature = ts.factory.createPropertySignature(void 0, `__brand_${validator.brand}`, void 0, neverType);
   const literal = ts.factory.createTypeLiteralNode([signature]);
   return ts.factory.createIntersectionTypeNode([numberType, literal]);
 });
-registerTypeGenerator(OptionalValidator, (validator, references) => {
-  return generateTypeNode(validator.validator, references);
+registerTypeGenerator(OptionalValidator, (validator, references, isInput) => {
+  return generateTypeNode(validator.validator, references, isInput);
 });
-registerTypeGenerator(StringValidator, (validator) => {
-  if (!validator.brand)
+registerTypeGenerator(StringValidator, (validator, _references, isInput) => {
+  if (!validator.brand || isInput)
     return stringType;
   const signature = ts.factory.createPropertySignature(void 0, `__brand_${validator.brand}`, void 0, neverType);
   const literal = ts.factory.createTypeLiteralNode([signature]);
   return ts.factory.createIntersectionTypeNode([stringType, literal]);
 });
-registerTypeGenerator(TupleValidator, (validator, references) => {
+registerTypeGenerator(TupleValidator, (validator, references, isInput) => {
   const members = validator.members;
   const { count, first, next } = members.reduce(({ count: count2, first: first2, next: next2 }, { single }, i) => {
     if (!single) {
@@ -129,35 +330,35 @@ registerTypeGenerator(TupleValidator, (validator, references) => {
   }, { count: 0, first: members.length, next: -1 });
   if (count < 2) {
     const types2 = members.map(({ single, validator: validator2 }) => {
-      const memberType = generateTypeNode(validator2, references);
+      const memberType = generateTypeNode(validator2, references, isInput);
       if (single)
-        return generateTypeNode(validator2, references);
+        return generateTypeNode(validator2, references, isInput);
       const arrayType = ts.factory.createArrayTypeNode(memberType);
       return ts.factory.createRestTypeNode(arrayType);
     });
     return ts.factory.createTupleTypeNode(types2);
   }
-  const before = members.slice(0, first).map(({ validator: validator2 }) => generateTypeNode(validator2, references));
-  const types = members.slice(first, next).map(({ validator: validator2 }) => generateTypeNode(validator2, references));
-  const after = members.slice(next).map(({ validator: validator2 }) => generateTypeNode(validator2, references));
+  const before = members.slice(0, first).map(({ validator: validator2 }) => generateTypeNode(validator2, references, isInput));
+  const types = members.slice(first, next).map(({ validator: validator2 }) => generateTypeNode(validator2, references, isInput));
+  const after = members.slice(next).map(({ validator: validator2 }) => generateTypeNode(validator2, references, isInput));
   const union = ts.factory.createUnionTypeNode(types);
   const array = ts.factory.createArrayTypeNode(union);
   const rest = ts.factory.createRestTypeNode(array);
   return ts.factory.createTupleTypeNode([...before, rest, ...after]);
 });
-registerTypeGenerator(AllOfValidator, (validator, references) => {
-  const members = validator.validators.map((validator2) => generateTypeNode(validator2, references));
+registerTypeGenerator(AllOfValidator, (validator, references, isInput) => {
+  const members = validator.validators.map((validator2) => generateTypeNode(validator2, references, isInput));
   return ts.factory.createIntersectionTypeNode(members);
 });
-registerTypeGenerator(OneOfValidator, (validator, references) => {
-  const members = validator.validators.map((validator2) => generateTypeNode(validator2, references));
+registerTypeGenerator(OneOfValidator, (validator, references, isInput) => {
+  const members = validator.validators.map((validator2) => generateTypeNode(validator2, references, isInput));
   return ts.factory.createUnionTypeNode(members);
 });
-registerTypeGenerator(ObjectValidator, (validator, references) => {
+registerTypeGenerator(ObjectValidator, (validator, references, isInput) => {
   const properties = [];
   for (const [key, valueValidator] of validator.validators.entries()) {
-    const type = generateTypeNode(valueValidator, references);
-    const optional = valueValidator.optional;
+    const type = generateTypeNode(valueValidator, references, isInput);
+    const optional = isInput && valueValidator.defaultValue !== void 0 || valueValidator.optional;
     const signature = ts.factory.createPropertySignature(
       void 0,
       key,
@@ -167,7 +368,7 @@ registerTypeGenerator(ObjectValidator, (validator, references) => {
     properties.push(signature);
   }
   if (validator.additionalProperties) {
-    const propertyType = generateTypeNode(validator.additionalProperties, references);
+    const propertyType = generateTypeNode(validator.additionalProperties, references, isInput);
     const extra = ts.factory.createMappedTypeNode(
       void 0,
       // readonly
@@ -188,7 +389,30 @@ registerTypeGenerator(ObjectValidator, (validator, references) => {
     return ts.factory.createTypeLiteralNode(properties);
   }
 });
+registerTypeGenerator(EAN13Validator, (_validator, _references, isInput) => {
+  if (isInput)
+    return ts.factory.createUnionTypeNode([numberType, stringType]);
+  const signature = ts.factory.createPropertySignature(void 0, "__ean_13", void 0, neverType);
+  const literal = ts.factory.createTypeLiteralNode([signature]);
+  return ts.factory.createIntersectionTypeNode([stringType, literal]);
+});
+registerTypeGenerator(UUIDValidator, (_validator, _references, isInput) => {
+  if (isInput)
+    return stringType;
+  const signature = ts.factory.createPropertySignature(void 0, "__uuid", void 0, neverType);
+  const literal = ts.factory.createTypeLiteralNode([signature]);
+  return ts.factory.createIntersectionTypeNode([stringType, literal]);
+});
+registerTypeGenerator(URLValidator, (_validator, _references, isInput) => {
+  const urlType = ts.factory.createTypeReferenceNode("URL");
+  if (isInput) {
+    return ts.factory.createUnionTypeNode([urlType, stringType]);
+  } else {
+    return urlType;
+  }
+});
 export {
+  generateDeclarations,
   generateTypes,
   registerTypeGenerator
 };

package/dist/dts-generator.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/dts-generator.ts"],
-  "mappings": "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",
-  "names": ["count", "first", "next", "types", "validator"]
+  "mappings": "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",
+  "names": ["a", "b", "count", "first", "next", "types", "validator"]
 }

package/dist/extra/arn.cjs

@@ -30,6 +30,11 @@ __export(arn_exports, {
 module.exports = __toCommonJS(arn_exports);
 var import_errors = require("../errors.cjs");
 var import_types = require("../types.cjs");
+function assertComponent(actual, expected, kind) {
+  if (expected === void 0)
+    return;
+  (0, import_errors.assertValidation)(actual === expected, `ARN ${kind} "${actual}" mismatch (expected "${expected}")`);
+}
 function parse(value, service, type) {
   (0, import_errors.assertValidation)(typeof value == "string", 'Value is not a "string"');
   const segments = value.split(":");
@@ -40,22 +45,20 @@ function parse(value, service, type) {
   (0, import_errors.assertValidation)(!!svc, "Missing service in ARN");
   (0, import_errors.assertValidation)(!!act, "Missing account ID in ARN");
   (0, import_errors.assertValidation)(!!res[0], "Missing resource ID in ARN");
-  if (service !== void 0) {
-    (0, import_errors.assertValidation)(svc === service, `ARN Service "${svc}" mismatch (expected "${service}")`);
-  }
-  const [resArray, resString] = res[0].includes("/") ? [res[0].split("/"), res[0]] : [res, res.join(":")];
-  (0, import_errors.assertValidation)(!!resArray[0], "Invalid resource ID in ARN");
-  if (type !== void 0) {
-    (0, import_errors.assertValidation)(resArray[0] === type, `ARN Resource Type "${resArray[0]}" mismatch (expected "${type}")`);
-  }
+  const [[resType, ...resArray], resString] = res[0].includes("/") ? [res[0].split("/"), res[0]] : [res, res.join(":")];
+  (0, import_errors.assertValidation)(!!resType, "Invalid resource ID in ARN");
+  assertComponent(svc, service, "Service");
+  assertComponent(resType, type, "Resource Type");
   const arn2 = `arn:${prt}:${svc}:${rgn}:${act}:${resString}`;
   return {
     Arn: arn2,
     Partition: prt,
     Service: svc,
+    // as Service,
     Region: rgn || "",
     Account: act,
-    Resource: resArray
+    Resource: [resType, ...resArray]
+    // as [ ResourceType, ...string[] ],
   };
 }
 var ParsedArnValidator = class extends import_types.AbstractValidator {

package/dist/extra/arn.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/extra/arn.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAiC;AACjC,mBAAwD;AAoBxD,SAAS,MACL,OACA,SACA,MACkB;AACpB,sCAAiB,OAAO,SAAS,UAAU,yBAAyB;AAEpE,QAAM,WAAW,MAAM,MAAM,GAAG;AAEhC,sCAAiB,SAAS,UAAU,GAAG,2BAA2B;AAElE,QAAM,CAAE,KAAK,KAAK,KAAK,KAAK,KAAK,GAAG,GAAI,IAAI;AAE5C,sCAAiB,QAAQ,OAAO,4BAA4B;AAC5D,sCAAiB,CAAC,CAAE,KAAK,0BAA0B;AACnD,sCAAiB,CAAC,CAAE,KAAK,wBAAwB;AACjD,sCAAiB,CAAC,CAAE,KAAK,2BAA2B;AACpD,sCAAiB,CAAC,CAAE,IAAI,CAAC,GAAG,4BAA4B;AAExD,MAAI,YAAY,QAAW;AACzB,wCAAiB,QAAQ,SAAS,gBAAgB,GAAG,yBAAyB,OAAO,IAAI;AAAA,EAC3F;AAEA,QAAM,CAAE,UAAU,SAAU,IAAI,IAAI,CAAC,EAAE,SAAS,GAAG,IACjD,CAAE,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,IAAI,CAAC,CAAE,IAC5B,CAAE,KAAK,IAAI,KAAK,GAAG,CAAE;AAEvB,sCAAiB,CAAC,CAAE,SAAS,CAAC,GAAG,4BAA4B;AAE7D,MAAI,SAAS,QAAW;AACtB,wCAAiB,SAAS,CAAC,MAAM,MAAM,sBAAsB,SAAS,CAAC,CAAC,yBAAyB,IAAI,IAAI;AAAA,EAC3G;AAEA,QAAMA,OAAM,OAAO,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,SAAS;AAExD,SAAO;AAAA,IACL,KAAKA;AAAA,IACL,WAAW;AAAA,IACX,SAAS;AAAA,IACT,QAAQ,OAAO;AAAA,IACf,SAAS;AAAA,IACT,UAAU;AAAA,EACZ;AACF;AAKO,IAAM,qBAAN,cACG,+BAA8C;AAAA,EAWtD,YAAoB,UAA4B,OAAgB;AAC9D,UAAM;AADY;AAA4B;AAAA,EAEhD;AAAA,EAEA,SAAS,OAAoC;AAC3C,WAAO,MAAM,OAAO,KAAK,UAAU,KAAK,KAAK;AAAA,EAC/C;AACF;AAGO,IAAM,eAAN,cACG,+BAA8C;AAAA,EAWtD,YAAoB,UAA4B,OAAgB;AAC9D,UAAM;AADY;AAA4B;AAAA,EAEhD;AAAA,EAEA,SAAS,OAAoC;AAC3C,WAAO,MAAM,OAAO,KAAK,UAAU,KAAK,KAAK,EAAE;AAAA,EACjD;AACF;AAYO,SAAS,gBACZ,SACA,cAC2B;AAC7B,SAAO,IAAI,mBAAmB,SAAS,YAAY;AACrD;AAUO,SAAS,WACZ,SACA,cACqB;AACvB,SAAO,IAAI,aAAa,SAAS,YAAY;AAC/C;AAKO,IAAM,eAAW,mCAAqB,IAAI,mBAAmB,GAAG,eAAe;AAG/E,IAAM,UAAM,mCAAqB,IAAI,aAAa,GAAG,UAAU;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAiC;AACjC,mBAAwD;AA4BxD,SAAS,gBACL,QACA,UACA,MACmB;AACrB,MAAI,aAAa;AAAW;AAC5B,sCAAiB,WAAW,UAAU,OAAO,IAAI,KAAK,MAAM,yBAAyB,QAAQ,IAAI;AACnG;AAGA,SAAS,MACL,OACA,SACA,MACgC;AAClC,sCAAiB,OAAO,SAAS,UAAU,yBAAyB;AAEpE,QAAM,WAAW,MAAM,MAAM,GAAG;AAEhC,sCAAiB,SAAS,UAAU,GAAG,2BAA2B;AAElE,QAAM,CAAE,KAAK,KAAK,KAAK,KAAK,KAAK,GAAG,GAAI,IAAI;AAE5C,sCAAiB,QAAQ,OAAO,4BAA4B;AAC5D,sCAAiB,CAAC,CAAE,KAAK,0BAA0B;AACnD,sCAAiB,CAAC,CAAE,KAAK,wBAAwB;AACjD,sCAAiB,CAAC,CAAE,KAAK,2BAA2B;AACpD,sCAAiB,CAAC,CAAE,IAAI,CAAC,GAAG,4BAA4B;AAExD,QAAM,CAAE,CAAE,SAAS,GAAG,QAAS,GAAG,SAAU,IAAI,IAAI,CAAC,EAAE,SAAS,GAAG,IACjE,CAAE,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,IAAI,CAAC,CAAE,IAC5B,CAAE,KAAK,IAAI,KAAK,GAAG,CAAE;AAEvB,sCAAiB,CAAC,CAAE,SAAS,4BAA4B;AAEzD,kBAAgB,KAAK,SAAS,SAAS;AACvC,kBAAgB,SAAS,MAAM,eAAe;AAE9C,QAAMA,OAAM,OAAO,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,SAAS;AAExD,SAAO;AAAA,IACL,KAAKA;AAAA,IACL,WAAW;AAAA,IACX,SAAS;AAAA;AAAA,IACT,QAAQ,OAAO;AAAA,IACf,SAAS;AAAA,IACT,UAAU,CAAE,SAAS,GAAG,QAAS;AAAA;AAAA,EACnC;AACF;AAKO,IAAM,qBAAN,cAGG,+BAA4D;AAAA,EAWpE,YAAoB,UAA4B,OAAsB;AACpE,UAAM;AADY;AAA4B;AAAA,EAEhD;AAAA,EAEA,SAAS,OAAkD;AACzD,WAAO,MAAM,OAAO,KAAK,UAAU,KAAK,KAAK;AAAA,EAC/C;AACF;AAGO,IAAM,eAAN,cAGG,+BAA4D;AAAA,EAWpE,YAAoB,UAA4B,OAAsB;AACpE,UAAM;AADY;AAA4B;AAAA,EAEhD;AAAA,EAEA,SAAS,OAAkD;AACzD,WAAO,MAAM,OAAO,KAAK,UAAU,KAAK,KAAK,EAAE;AAAA,EACjD;AACF;AAYO,SAAS,gBAGZ,SACA,cACyC;AAC3C,SAAO,IAAI,mBAAmB,SAAS,YAAY;AACrD;AAUO,SAAS,WAGZ,SACA,cACmC;AACrC,SAAO,IAAI,aAAa,SAAS,YAAY;AAC/C;AAKO,IAAM,eAAW,mCAAqB,IAAI,mBAAmB,GAAG,eAAe;AAG/E,IAAM,UAAM,mCAAqB,IAAI,aAAa,GAAG,UAAU;",
   "names": ["arn"]
 }

package/dist/extra/arn.d.ts

@@ -1,22 +1,24 @@
 import { AbstractValidator } from '../types';
 /** The type for a validated _string_ ARN (Amazon Resource Name) */
-export type ArnString<Service extends string = string> = string & {
+export type ArnString<Service extends string = string, ResourceType extends string = string> = string & {
     __arn: never;
 } & (string extends Service ? string : {
-    [k in `__arn_${Service}`]: never;
+    [k in `__arn_service_${Service}`]: never;
+}) & (string extends ResourceType ? string : {
+    [k in `__arn_resource_${ResourceType}`]: never;
 });
 /** The type for a _parsed_ ARN (Amazon Resource Name) */
-export interface ParsedArn<Service extends string = string> {
+export interface ParsedArn<Service extends string = string, ResourceType extends string = string> {
     /** The full  */
-    Arn: ArnString<Service>;
+    Arn: ArnString<Service, ResourceType>;
     Partition: string;
     Service: Service;
     Region: string;
     Account: string;
-    Resource: [string, ...string[]];
+    Resource: [ResourceType, ...string[]];
 }
 /** Validator parsing an ARN (Amazon Resource Name) and returning its components */
-export declare class ParsedArnValidator<Service extends string = string> extends AbstractValidator<ParsedArn<Service>, string> {
+export declare class ParsedArnValidator<Service extends string = string, ResourceType extends string = string> extends AbstractValidator<ParsedArn<Service, ResourceType>, string> {
     private _service?;
     private _type?;
     /**
@@ -28,11 +30,11 @@ export declare class ParsedArnValidator<Service extends string = string> extends
      *                     representing (e.g. `role` in the `iam` service, or
      *                     `targetgroup` in the `elasticloadbalancing` service)
      */
-    constructor(service?: Service, resourceType?: string);
-    validate(value: unknown): ParsedArn<Service>;
+    constructor(service?: Service, resourceType?: ResourceType);
+    validate(value: unknown): ParsedArn<Service, ResourceType>;
 }
 /** Validator validating an ARN (Amazon Resource Name) _string_ */
-export declare class ArnValidator<Service extends string = string> extends AbstractValidator<ArnString<Service>, string> {
+export declare class ArnValidator<Service extends string = string, ResourceType extends string = string> extends AbstractValidator<ArnString<Service, ResourceType>, string> {
     private _service?;
     private _type?;
     /**
@@ -44,8 +46,8 @@ export declare class ArnValidator<Service extends string = string> extends Abstr
      *                     representing (e.g. `role` in the `iam` service, or
      *                     `targetgroup` in the `elasticloadbalancing` service)
      */
-    constructor(service?: Service, resourceType?: string);
-    validate(value: unknown): ArnString<Service>;
+    constructor(service?: Service, resourceType?: ResourceType);
+    validate(value: unknown): ArnString<Service, ResourceType>;
 }
 /**
  * Create a new {@link ParsedArnValidator} parsing an ARN referring to the
@@ -55,7 +57,7 @@ export declare class ArnValidator<Service extends string = string> extends Abstr
  * component of the ARN's resource (e.g. `role` in the `iam` service, or
  * `targetgroup` in the `elasticloadbalancing` service)
  */
-export declare function parseArnFactory<Service extends string = string>(service: Service, resourceType?: string): ParsedArnValidator<Service>;
+export declare function parseArnFactory<Service extends string = string, ResourceType extends string = string>(service: Service, resourceType?: ResourceType): ParsedArnValidator<Service, ResourceType>;
 /**
  * Create a new {@link ArnValidator} validating an ARN referring to the
  * specified `service` (e.g. `iam` or `elasticloadbalancing`).
@@ -64,8 +66,8 @@ export declare function parseArnFactory<Service extends string = string>(service
  * component of the ARN's resource (e.g. `role` in the `iam` service, or
  * `targetgroup` in the `elasticloadbalancing` service)
  */
-export declare function arnFactory<Service extends string = string>(service: Service, resourceType?: string): ArnValidator<Service>;
+export declare function arnFactory<Service extends string = string, ResourceType extends string = string>(service: Service, resourceType?: ResourceType): ArnValidator<Service, ResourceType>;
 /** Validate a string and parse it into into an {@link ParsedArn} */
-export declare const parseArn: typeof parseArnFactory & ParsedArnValidator<string>;
+export declare const parseArn: typeof parseArnFactory & ParsedArnValidator<string, string>;
 /** Validate a ARN (Amazon Resource Name) string */
-export declare const arn: typeof arnFactory & ArnValidator<string>;
+export declare const arn: typeof arnFactory & ArnValidator<string, string>;

package/dist/extra/arn.mjs

@@ -1,6 +1,11 @@
 // extra/arn.ts
 import { assertValidation } from "../errors.mjs";
 import { AbstractValidator, makeValidatorFactory } from "../types.mjs";
+function assertComponent(actual, expected, kind) {
+  if (expected === void 0)
+    return;
+  assertValidation(actual === expected, `ARN ${kind} "${actual}" mismatch (expected "${expected}")`);
+}
 function parse(value, service, type) {
   assertValidation(typeof value == "string", 'Value is not a "string"');
   const segments = value.split(":");
@@ -11,22 +16,20 @@ function parse(value, service, type) {
   assertValidation(!!svc, "Missing service in ARN");
   assertValidation(!!act, "Missing account ID in ARN");
   assertValidation(!!res[0], "Missing resource ID in ARN");
-  if (service !== void 0) {
-    assertValidation(svc === service, `ARN Service "${svc}" mismatch (expected "${service}")`);
-  }
-  const [resArray, resString] = res[0].includes("/") ? [res[0].split("/"), res[0]] : [res, res.join(":")];
-  assertValidation(!!resArray[0], "Invalid resource ID in ARN");
-  if (type !== void 0) {
-    assertValidation(resArray[0] === type, `ARN Resource Type "${resArray[0]}" mismatch (expected "${type}")`);
-  }
+  const [[resType, ...resArray], resString] = res[0].includes("/") ? [res[0].split("/"), res[0]] : [res, res.join(":")];
+  assertValidation(!!resType, "Invalid resource ID in ARN");
+  assertComponent(svc, service, "Service");
+  assertComponent(resType, type, "Resource Type");
   const arn2 = `arn:${prt}:${svc}:${rgn}:${act}:${resString}`;
   return {
     Arn: arn2,
     Partition: prt,
     Service: svc,
+    // as Service,
     Region: rgn || "",
     Account: act,
-    Resource: resArray
+    Resource: [resType, ...resArray]
+    // as [ ResourceType, ...string[] ],
   };
 }
 var ParsedArnValidator = class extends AbstractValidator {