@maroonedog/luq 2.0.0 → 2.2.0

package/dist/path/create-value-writer.mjs

@@ -32,9 +32,32 @@ function writeInto(container, keys, depth, value) {
  * conjure an array — the declaration grammar cannot express `items[0]`, so a
  * numeric key here is a Record key.
  */
+/**
+ * キーを own プロパティとして置く。**代入演算子を使わない。**
+ *
+ * `copy[key] = value` は key が "__proto__" のとき Object.prototype の
+ * アクセサ (setter) を呼び、own プロパティを作る代わりにプロトタイプを
+ * 差し替えてしまう。defineProperty はアクセサを見ずに own プロパティを
+ * 定義するので、"__proto__" という名前のプロパティを安全に持てる。
+ *
+ * "constructor" と "prototype" は Object.prototype 上でデータプロパティ
+ * なので代入でも own プロパティになるが、キーごとに分岐すると分岐のほうを
+ * 間違えるので一律にこちらを通す。
+ *
+ * これが「宣言パスに __proto__ を書けるようにする」の前提。書き込みが安全に
+ * なったので、パス文法の側で拒否する必要が無くなった (reserved-segment.ts)。
+ */
+function putOwnProperty(target, key, value) {
+    Object.defineProperty(target, key, {
+        value,
+        writable: true,
+        enumerable: true,
+        configurable: true,
+    });
+}
 function vivify(key, written) {
     const created = {};
-    created[key] = written;
+    putOwnProperty(created, key, written);
     return created;
 }
 function copyWith(container, key, value) {
@@ -46,7 +69,9 @@ function copyWith(container, key, value) {
         copy[index] = value;
         return copy;
     }
+    // スプレッドは own の列挙可能プロパティを CreateDataProperty で写すので、
+    // ここでは setter は動かない。危ないのは下の代入だけ。
     const copy = { ...container };
-    copy[key] = value;
+    putOwnProperty(copy, key, value);
     return copy;
 }

package/dist/path/reserved-segment.d.ts

@@ -1,7 +1,25 @@
-/** Segment names that reach `Object.prototype` and must never be walked,
- *  written, or vivified. `fromJsonSchema` derives segments verbatim from
- *  untrusted schema property names, so this list is a security boundary, not a
- *  style preference. */
+/**
+ * `Object.prototype` 上に同名のものがあるキー。
+ *
+ * **これはもう拒否リストではない。** 以前はこの3つを宣言パスに書けなくして
+ * いたが、その拒否は過剰だった。危険なのは書き込みだけで、しかも本当に危ない
+ * のは "__proto__" ひとつである:
+ *
+ *   読み取り  create-value-reader.ts が hasOwnProperty.call で own プロパティ
+ *             しか読まないので、プロトタイプは最初から辿らない
+ *   書き込み  `target[key] = value` は "__proto__" のとき Object.prototype の
+ *             **アクセサ** を呼び、own プロパティを作らずプロトタイプを差し替える。
+ *             "constructor" と "prototype" はデータプロパティなので代入でも
+ *             own プロパティになるだけで、汚染にはならない
+ *
+ * create-value-writer.ts が代入をやめて defineProperty に移したことで、
+ * この経路が閉じた。したがって名前で拒否する必要が無くなり、
+ * `{ "properties": { "__proto__": ... } }` のようなスキーマを検証できる
+ * ようになった (JSON-Schema-Test-Suite の properties.json が要求している)。
+ *
+ * リスト自体は残す。テストが「この3つを書いても Object.prototype が汚れない」
+ * ことを名指しで確認するのに使う (test/unit/path/create-value-writer.test.ts)。
+ */
 export declare const RESERVED_SEGMENTS: readonly string[];
 /** Thrown at BUILD time for every malformed or unsafe path. A declared rule
  *  must either execute or fail loudly; the legacy silent `return () => null`

package/dist/path/reserved-segment.js

@@ -13,10 +13,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathSyntaxError = exports.RESERVED_SEGMENTS = void 0;
 exports.isReservedSegment = isReservedSegment;
 exports.assertDeclarableKey = assertDeclarableKey;
-/** Segment names that reach `Object.prototype` and must never be walked,
- *  written, or vivified. `fromJsonSchema` derives segments verbatim from
- *  untrusted schema property names, so this list is a security boundary, not a
- *  style preference. */
+/**
+ * `Object.prototype` 上に同名のものがあるキー。
+ *
+ * **これはもう拒否リストではない。** 以前はこの3つを宣言パスに書けなくして
+ * いたが、その拒否は過剰だった。危険なのは書き込みだけで、しかも本当に危ない
+ * のは "__proto__" ひとつである:
+ *
+ *   読み取り  create-value-reader.ts が hasOwnProperty.call で own プロパティ
+ *             しか読まないので、プロトタイプは最初から辿らない
+ *   書き込み  `target[key] = value` は "__proto__" のとき Object.prototype の
+ *             **アクセサ** を呼び、own プロパティを作らずプロトタイプを差し替える。
+ *             "constructor" と "prototype" はデータプロパティなので代入でも
+ *             own プロパティになるだけで、汚染にはならない
+ *
+ * create-value-writer.ts が代入をやめて defineProperty に移したことで、
+ * この経路が閉じた。したがって名前で拒否する必要が無くなり、
+ * `{ "properties": { "__proto__": ... } }` のようなスキーマを検証できる
+ * ようになった (JSON-Schema-Test-Suite の properties.json が要求している)。
+ *
+ * リスト自体は残す。テストが「この3つを書いても Object.prototype が汚れない」
+ * ことを名指しで確認するのに使う (test/unit/path/create-value-writer.test.ts)。
+ */
 exports.RESERVED_SEGMENTS = Object.freeze([
     "__proto__",
     "constructor",
@@ -62,7 +80,9 @@ function assertDeclarableKey(key, source) {
         throw new PathSyntaxError(source, `the key ${JSON.stringify(key)} contains a bracket; "[*]" is the only ` +
             "bracket form and it must trail a key");
     }
-    if (isReservedSegment(key)) {
-        throw new PathSyntaxError(source, `${JSON.stringify(key)} is a reserved segment (prototype pollution)`);
-    }
+    // 予約セグメントの拒否はここから外した。理由は RESERVED_SEGMENTS の
+    // コメントに書いてある。要約すると、危険なのは書き込みだけで、その書き込みは
+    // create-value-writer.ts が defineProperty に移したので安全になった。
+    // 名前で拒否する必要が無くなり、JSON Schema が "__proto__" というキーを
+    // 持つオブジェクトを検証できるようになった。
 }

package/dist/path/reserved-segment.mjs

@@ -8,10 +8,28 @@
 // Putting the class the other way round would make the two files mutually
 // dependent for no gain.
 // ===========================================================================
-/** Segment names that reach `Object.prototype` and must never be walked,
- *  written, or vivified. `fromJsonSchema` derives segments verbatim from
- *  untrusted schema property names, so this list is a security boundary, not a
- *  style preference. */
+/**
+ * `Object.prototype` 上に同名のものがあるキー。
+ *
+ * **これはもう拒否リストではない。** 以前はこの3つを宣言パスに書けなくして
+ * いたが、その拒否は過剰だった。危険なのは書き込みだけで、しかも本当に危ない
+ * のは "__proto__" ひとつである:
+ *
+ *   読み取り  create-value-reader.ts が hasOwnProperty.call で own プロパティ
+ *             しか読まないので、プロトタイプは最初から辿らない
+ *   書き込み  `target[key] = value` は "__proto__" のとき Object.prototype の
+ *             **アクセサ** を呼び、own プロパティを作らずプロトタイプを差し替える。
+ *             "constructor" と "prototype" はデータプロパティなので代入でも
+ *             own プロパティになるだけで、汚染にはならない
+ *
+ * create-value-writer.ts が代入をやめて defineProperty に移したことで、
+ * この経路が閉じた。したがって名前で拒否する必要が無くなり、
+ * `{ "properties": { "__proto__": ... } }` のようなスキーマを検証できる
+ * ようになった (JSON-Schema-Test-Suite の properties.json が要求している)。
+ *
+ * リスト自体は残す。テストが「この3つを書いても Object.prototype が汚れない」
+ * ことを名指しで確認するのに使う (test/unit/path/create-value-writer.test.ts)。
+ */
 export const RESERVED_SEGMENTS = Object.freeze([
     "__proto__",
     "constructor",
@@ -56,7 +74,9 @@ export function assertDeclarableKey(key, source) {
         throw new PathSyntaxError(source, `the key ${JSON.stringify(key)} contains a bracket; "[*]" is the only ` +
             "bracket form and it must trail a key");
     }
-    if (isReservedSegment(key)) {
-        throw new PathSyntaxError(source, `${JSON.stringify(key)} is a reserved segment (prototype pollution)`);
-    }
+    // 予約セグメントの拒否はここから外した。理由は RESERVED_SEGMENTS の
+    // コメントに書いてある。要約すると、危険なのは書き込みだけで、その書き込みは
+    // create-value-writer.ts が defineProperty に移したので安全になった。
+    // 名前で拒否する必要が無くなり、JSON Schema が "__proto__" というキーを
+    // 持つオブジェクトを検証できるようになった。
 }

package/dist/plugin-kit/compiled-rule.d.ts

@@ -16,6 +16,19 @@ export interface PresenceAllowance {
     readonly allowUndefined: boolean;
     readonly allowNull: boolean;
     readonly emptyStringIsMissing: boolean;
+    /**
+     * True when `null` is a VALUE this subject has to judge, rather than an
+     * absence presence may settle. Draft-07 sub-schemas need it: `false`,
+     * `{"not": {}}` and an `enum` without null all forbid null WITHOUT saying
+     * anything about `type`, and presence — which runs first — was answering
+     * for them. `[null]` passed `{"items":{"not":{}}}` because no check ever
+     * ran.
+     *
+     * Optional, and absent means false: a field the user declared keeps the
+     * builder's meaning, where `.nullable()` ENDS the field on null. Only
+     * src/json-schema/ turns it on.
+     */
+    readonly nullIsValue?: boolean;
 }
 export interface PresenceRule extends PresenceAllowance {
     readonly kind: "presence";

package/dist/plugin-kit/create-rule.d.ts

@@ -16,6 +16,17 @@ export interface PresenceSpec<C extends MessageContextExtra> {
     readonly allowUndefined: boolean;
     readonly allowNull: boolean;
     readonly emptyStringIsMissing: boolean;
+    /**
+     * True when `null` must be JUDGED here rather than settled by presence.
+     *
+     * OPTIONAL, and false by default, because `presence()` is an API plugin
+     * AUTHORS use: making it required would break every plugin outside this
+     * repository to add a flag almost none of them want. The default is the
+     * behaviour that was always there — `.nullable()` ends the field on null.
+     * src/json-schema/ sets it, because a DOCUMENT decides whether null is
+     * allowed and `type` is not the only keyword that decides it.
+     */
+    readonly nullIsValue?: boolean;
     describe(ctx: MessageContext): string;
     buildMessageContext(): C;
 }

package/dist/plugin-kit/create-rule.js

@@ -28,6 +28,7 @@ function presence(spec) {
         allowUndefined: spec.allowUndefined,
         allowNull: spec.allowNull,
         emptyStringIsMissing: spec.emptyStringIsMissing,
+        nullIsValue: spec.nullIsValue === true,
         describe: (ctx) => (0, rule_build_context_1.renderMessage)(spec.messageFactory, ctx, spec.buildMessageContext(), spec.describe(ctx)),
     };
 }

package/dist/plugin-kit/create-rule.mjs

@@ -18,6 +18,7 @@ export function presence(spec) {
         allowUndefined: spec.allowUndefined,
         allowNull: spec.allowNull,
         emptyStringIsMissing: spec.emptyStringIsMissing,
+        nullIsValue: spec.nullIsValue === true,
         describe: (ctx) => renderMessage(spec.messageFactory, ctx, spec.buildMessageContext(), spec.describe(ctx)),
     };
 }

package/dist/plugin-kit/marker.types.d.ts

@@ -45,6 +45,22 @@ export interface TransformOut {
 export interface GuardOut {
     readonly [MARKER]: "guardOut";
 }
+/**
+ * Like GuardOut, these exist so ChainMethod can give the method a call-site
+ * type parameter. ResolveArgs resolves each argument against a FIXED
+ * TRoot/TValue and cannot make argument 2 depend on argument 1, so a plugin
+ * whose second argument is typed by its first has to come through this door.
+ *
+ * `StitchOut` types the FIELD VALUES a cross-field predicate receives, from
+ * the paths named in argument 1. `BundleOut` types the SUBJECT of a sub-chain,
+ * from the alias-to-path map in argument 1.
+ */
+export interface StitchOut {
+    readonly [MARKER]: "stitchOut";
+}
+export interface BundleOut {
+    readonly [MARKER]: "bundleOut";
+}
 export type PresenceShiftKind = "excludeMissing" | "excludeUndefined" | "excludeNull" | "allowNull";
 export interface PresenceShift<K extends PresenceShiftKind> {
     readonly [MARKER]: "presence";
@@ -75,6 +91,8 @@ export interface OutputMarkerRegistry {
     readonly unchanged: Unchanged;
     readonly transformOut: TransformOut;
     readonly guardOut: GuardOut;
+    readonly stitchOut: StitchOut;
+    readonly bundleOut: BundleOut;
     readonly excludeMissing: PresenceShift<"excludeMissing">;
     readonly excludeUndefined: PresenceShift<"excludeUndefined">;
     readonly excludeNull: PresenceShift<"excludeNull">;

package/dist/plugin-kit/plugin-definition.d.ts

@@ -21,6 +21,8 @@ export interface PluginDefinition<TName extends string, TMethod extends string,
      * resolves exactly those positions to `readonly Rule[]` before build() runs.
      */
     readonly subChainArguments?: readonly number[];
+    /** See PluginSpec.judgesNull. Read by src/chain/create-chain-node.ts. */
+    readonly judgesNull?: boolean;
     readonly signature?: TSig;
 }
 export type AnyPlugin = PluginDefinition<string, string, readonly TypeName[], PluginSignature>;
@@ -30,6 +32,19 @@ export interface PluginSpec<TName extends string, TMethod extends string, TSlots
     readonly slots: TSlots;
     readonly build: PluginBuild<TSig>;
     readonly subChainArguments?: readonly number[];
+    /**
+     * True when this plugin's rule must be given `null` to judge, instead of
+     * presence settling it first.
+     *
+     * A field with no presence rule carries OPEN_PRESENCE, which ENDS the field
+     * on null before a single check runs. For most plugins that is right —
+     * `.min(3)` has no business firing on a value the schema said may be
+     * absent. It is wrong for a plugin that carries a whole document: a JSON
+     * Schema says whether null is allowed, and `false`, `{"not":{}}` and an
+     * `enum` without null all forbid it while saying nothing about `type`.
+     * Without this, `.jsonSchemaFullFeature({"type":"string"})` accepted null.
+     */
+    readonly judgesNull?: boolean;
 }
 /** Curried: the signature is explicit, the identity literals are inferred. */
 export declare function definePlugin<TSig extends PluginSignature>(): <TName extends string, TMethod extends string, TSlots extends readonly TypeName[]>(spec: PluginSpec<TName, TMethod, TSlots, TSig>) => PluginDefinition<TName, TMethod, TSlots, TSig>;

package/dist/plugin-kit/plugin-definition.js

@@ -9,6 +9,7 @@ function definePlugin() {
         method: spec.method,
         slots: spec.slots,
         build: spec.build,
+        judgesNull: spec.judgesNull,
         // Only present when the plugin declared one, so a plugin that takes no
         // sub-chain keeps exactly the four members it always had.
         ...(spec.subChainArguments === undefined

package/dist/plugin-kit/plugin-definition.mjs

@@ -5,6 +5,7 @@ export function definePlugin() {
         method: spec.method,
         slots: spec.slots,
         build: spec.build,
+        judgesNull: spec.judgesNull,
         // Only present when the plugin declared one, so a plugin that takes no
         // sub-chain keeps exactly the four members it always had.
         ...(spec.subChainArguments === undefined

package/dist/plugins/index.generated.d.ts

@@ -41,6 +41,7 @@ export { requiredPlugin } from "./required";
 export { requiredIfPlugin } from "./required-if";
 export { skipPlugin } from "./skip";
 export { stitchPlugin } from "./stitch";
+export { stitchWithPlugin } from "./stitch-with";
 export { stringAlphanumericPlugin } from "./string-alphanumeric";
 export { stringBase64Plugin } from "./string-base64";
 export { stringContentEncodingPlugin } from "./string-content-encoding";

package/dist/plugins/index.generated.js

@@ -2,8 +2,8 @@
 // GENERATED FILE - 手で編集しないでください。
 // 生成元: プラグインディレクトリ構造 (scripts/catalog/build-plugin-catalog.ts)。
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringDurationPlugin = exports.stringDatetimePlugin = exports.stringDatePlugin = exports.stringContentMediaTypePlugin = exports.stringContentEncodingPlugin = exports.stringBase64Plugin = exports.stringAlphanumericPlugin = exports.stitchPlugin = exports.skipPlugin = exports.requiredIfPlugin = exports.requiredPlugin = exports.readOnlyPlugin = exports.orFailPlugin = exports.optionalIfPlugin = exports.optionalPlugin = exports.oneOfPlugin = exports.objectRecursivelyPlugin = exports.objectPropertyNamesPlugin = exports.objectPatternPropertiesPlugin = exports.objectMinPropertiesPlugin = exports.objectMaxPropertiesPlugin = exports.objectDependentSchemasPlugin = exports.objectDependentRequiredPlugin = exports.objectAdditionalPropertiesSchemaPlugin = exports.objectAdditionalPropertiesPlugin = exports.objectPlugin = exports.numberRangePlugin = exports.numberPositivePlugin = exports.numberNegativePlugin = exports.numberMultipleOfPlugin = exports.numberMinPlugin = exports.numberMaxPlugin = exports.numberIntegerPlugin = exports.numberFinitePlugin = exports.nullablePlugin = exports.literalPlugin = exports.jsonSchemaFullFeaturePlugin = exports.jsonSchemaPlugin = exports.fromContextPlugin = exports.customPlugin = exports.conditionalSchemaPlugin = exports.compareFieldPlugin = exports.booleanTruthyPlugin = exports.booleanFalsyPlugin = exports.arrayUniquePlugin = exports.arrayMinLengthPlugin = exports.arrayMaxLengthPlugin = exports.arrayIncludesPlugin = exports.arrayEachPlugin = exports.arrayContainsPlugin = void 0;
-exports.writeOnlyPlugin = exports.validateIfPlugin = exports.uuidPlugin = exports.unionGuardPlugin = exports.tupleBuilderPlugin = exports.transformPlugin = exports.stringUrlPlugin = exports.stringUriTemplatePlugin = exports.stringUriReferencePlugin = exports.stringTimePlugin = exports.stringStartsWithPlugin = exports.stringRelativeJsonPointerPlugin = exports.stringRegexPlugin = exports.stringPatternPlugin = exports.stringMinPlugin = exports.stringMaxPlugin = exports.stringJsonPointerPlugin = exports.stringIriReferencePlugin = exports.stringIriPlugin = exports.stringIpv6Plugin = exports.stringIpv4Plugin = exports.stringIdnHostnamePlugin = exports.stringIdnEmailPlugin = exports.stringHostnamePlugin = exports.stringExactLengthPlugin = exports.stringEndsWithPlugin = exports.stringEmailPlugin = void 0;
+exports.stringDatetimePlugin = exports.stringDatePlugin = exports.stringContentMediaTypePlugin = exports.stringContentEncodingPlugin = exports.stringBase64Plugin = exports.stringAlphanumericPlugin = exports.stitchWithPlugin = exports.stitchPlugin = exports.skipPlugin = exports.requiredIfPlugin = exports.requiredPlugin = exports.readOnlyPlugin = exports.orFailPlugin = exports.optionalIfPlugin = exports.optionalPlugin = exports.oneOfPlugin = exports.objectRecursivelyPlugin = exports.objectPropertyNamesPlugin = exports.objectPatternPropertiesPlugin = exports.objectMinPropertiesPlugin = exports.objectMaxPropertiesPlugin = exports.objectDependentSchemasPlugin = exports.objectDependentRequiredPlugin = exports.objectAdditionalPropertiesSchemaPlugin = exports.objectAdditionalPropertiesPlugin = exports.objectPlugin = exports.numberRangePlugin = exports.numberPositivePlugin = exports.numberNegativePlugin = exports.numberMultipleOfPlugin = exports.numberMinPlugin = exports.numberMaxPlugin = exports.numberIntegerPlugin = exports.numberFinitePlugin = exports.nullablePlugin = exports.literalPlugin = exports.jsonSchemaFullFeaturePlugin = exports.jsonSchemaPlugin = exports.fromContextPlugin = exports.customPlugin = exports.conditionalSchemaPlugin = exports.compareFieldPlugin = exports.booleanTruthyPlugin = exports.booleanFalsyPlugin = exports.arrayUniquePlugin = exports.arrayMinLengthPlugin = exports.arrayMaxLengthPlugin = exports.arrayIncludesPlugin = exports.arrayEachPlugin = exports.arrayContainsPlugin = void 0;
+exports.writeOnlyPlugin = exports.validateIfPlugin = exports.uuidPlugin = exports.unionGuardPlugin = exports.tupleBuilderPlugin = exports.transformPlugin = exports.stringUrlPlugin = exports.stringUriTemplatePlugin = exports.stringUriReferencePlugin = exports.stringTimePlugin = exports.stringStartsWithPlugin = exports.stringRelativeJsonPointerPlugin = exports.stringRegexPlugin = exports.stringPatternPlugin = exports.stringMinPlugin = exports.stringMaxPlugin = exports.stringJsonPointerPlugin = exports.stringIriReferencePlugin = exports.stringIriPlugin = exports.stringIpv6Plugin = exports.stringIpv4Plugin = exports.stringIdnHostnamePlugin = exports.stringIdnEmailPlugin = exports.stringHostnamePlugin = exports.stringExactLengthPlugin = exports.stringEndsWithPlugin = exports.stringEmailPlugin = exports.stringDurationPlugin = void 0;
 var array_contains_1 = require("./array-contains");
 Object.defineProperty(exports, "arrayContainsPlugin", { enumerable: true, get: function () { return array_contains_1.arrayContainsPlugin; } });
 var array_each_1 = require("./array-each");
@@ -90,6 +90,8 @@ var skip_1 = require("./skip");
 Object.defineProperty(exports, "skipPlugin", { enumerable: true, get: function () { return skip_1.skipPlugin; } });
 var stitch_1 = require("./stitch");
 Object.defineProperty(exports, "stitchPlugin", { enumerable: true, get: function () { return stitch_1.stitchPlugin; } });
+var stitch_with_1 = require("./stitch-with");
+Object.defineProperty(exports, "stitchWithPlugin", { enumerable: true, get: function () { return stitch_with_1.stitchWithPlugin; } });
 var string_alphanumeric_1 = require("./string-alphanumeric");
 Object.defineProperty(exports, "stringAlphanumericPlugin", { enumerable: true, get: function () { return string_alphanumeric_1.stringAlphanumericPlugin; } });
 var string_base64_1 = require("./string-base64");

package/dist/plugins/index.generated.mjs

@@ -43,6 +43,7 @@ export { requiredPlugin } from "./required/index.mjs";
 export { requiredIfPlugin } from "./required-if/index.mjs";
 export { skipPlugin } from "./skip/index.mjs";
 export { stitchPlugin } from "./stitch/index.mjs";
+export { stitchWithPlugin } from "./stitch-with/index.mjs";
 export { stringAlphanumericPlugin } from "./string-alphanumeric/index.mjs";
 export { stringBase64Plugin } from "./string-base64/index.mjs";
 export { stringContentEncodingPlugin } from "./string-content-encoding/index.mjs";

package/dist/plugins/manifest.generated.js

@@ -46,6 +46,7 @@ exports.PLUGIN_MANIFEST = [
     { directoryName: "required-if", subpathName: "requiredIf", tier: "isolated", entryFile: "src/plugins/required-if/index.ts", exportedSymbols: ["requiredIfPlugin"] },
     { directoryName: "skip", subpathName: "skip", tier: "isolated", entryFile: "src/plugins/skip/index.ts", exportedSymbols: ["skipPlugin"] },
     { directoryName: "stitch", subpathName: "stitch", tier: "isolated", entryFile: "src/plugins/stitch/index.ts", exportedSymbols: ["stitchPlugin"] },
+    { directoryName: "stitch-with", subpathName: "stitchWith", tier: "isolated", entryFile: "src/plugins/stitch-with/index.ts", exportedSymbols: ["stitchWithPlugin"] },
     { directoryName: "string-alphanumeric", subpathName: "stringAlphanumeric", tier: "isolated", entryFile: "src/plugins/string-alphanumeric/index.ts", exportedSymbols: ["stringAlphanumericPlugin"] },
     { directoryName: "string-base64", subpathName: "stringBase64", tier: "isolated", entryFile: "src/plugins/string-base64/index.ts", exportedSymbols: ["stringBase64Plugin"] },
     { directoryName: "string-content-encoding", subpathName: "stringContentEncoding", tier: "isolated", entryFile: "src/plugins/string-content-encoding/index.ts", exportedSymbols: ["stringContentEncodingPlugin"] },

package/dist/plugins/manifest.generated.mjs

@@ -43,6 +43,7 @@ export const PLUGIN_MANIFEST = [
     { directoryName: "required-if", subpathName: "requiredIf", tier: "isolated", entryFile: "src/plugins/required-if/index.ts", exportedSymbols: ["requiredIfPlugin"] },
     { directoryName: "skip", subpathName: "skip", tier: "isolated", entryFile: "src/plugins/skip/index.ts", exportedSymbols: ["skipPlugin"] },
     { directoryName: "stitch", subpathName: "stitch", tier: "isolated", entryFile: "src/plugins/stitch/index.ts", exportedSymbols: ["stitchPlugin"] },
+    { directoryName: "stitch-with", subpathName: "stitchWith", tier: "isolated", entryFile: "src/plugins/stitch-with/index.ts", exportedSymbols: ["stitchWithPlugin"] },
     { directoryName: "string-alphanumeric", subpathName: "stringAlphanumeric", tier: "isolated", entryFile: "src/plugins/string-alphanumeric/index.ts", exportedSymbols: ["stringAlphanumericPlugin"] },
     { directoryName: "string-base64", subpathName: "stringBase64", tier: "isolated", entryFile: "src/plugins/string-base64/index.ts", exportedSymbols: ["stringBase64Plugin"] },
     { directoryName: "string-content-encoding", subpathName: "stringContentEncoding", tier: "isolated", entryFile: "src/plugins/string-content-encoding/index.ts", exportedSymbols: ["stringContentEncodingPlugin"] },

package/dist/plugins/object-additional-properties/object-additional-properties-schema.d.ts

@@ -8,7 +8,7 @@ import type { UnexpectedPropertiesExtra } from "./object-additional-properties";
  * needsFromOthers), which is why it is spread on rather than passed in.
  */
 export declare const objectAdditionalPropertiesSchemaPlugin: import("../../plugin-kit/plugin-definition").PluginDefinition<"objectAdditionalPropertiesSchema", "additionalPropertiesSchema", readonly ["object"], {
-    args: readonly [schema: PropertyValueChain, allowedProperties?: readonly string[]];
+    args: readonly [schema: PropertyValueChain, allowedProperties?: readonly string[], allowedPatterns?: readonly string[]];
     out: Unchanged;
     context: UnexpectedPropertiesExtra;
 }>;

package/dist/plugins/object-additional-properties/object-additional-properties-schema.js

@@ -12,6 +12,7 @@ exports.objectAdditionalPropertiesSchemaPlugin = void 0;
 const types_1 = require("../../types");
 const create_rule_1 = require("../../plugin-kit/create-rule");
 const plugin_definition_1 = require("../../plugin-kit/plugin-definition");
+const select_additional_keys_1 = require("./select-additional-keys");
 /**
  * WHICH argument positions carry a sub-chain cannot be recovered from a
  * plugin's type at run time — a NarrowedChain and a RootPredicate are both
@@ -24,8 +25,9 @@ exports.objectAdditionalPropertiesSchemaPlugin =
     name: "objectAdditionalPropertiesSchema",
     method: "additionalPropertiesSchema",
     slots: ["object"],
-    build: (ctx, schema, allowedProperties) => {
+    build: (ctx, schema, allowedProperties, allowedPatterns) => {
         const known = new Set(allowedProperties ?? ctx.declaredSiblingKeys);
+        const patterns = (0, select_additional_keys_1.compilePatterns)(allowedPatterns);
         const branches = [
             (0, create_rule_1.branch)("additional", schema),
         ];
@@ -37,7 +39,7 @@ exports.objectAdditionalPropertiesSchemaPlugin =
             combine: (runners) => (value, runCtx) => {
                 if (!(0, types_1.isPlainObject)(value))
                     return types_1.PASS;
-                const extra = Object.keys(value).filter((key) => !known.has(key));
+                const extra = (0, select_additional_keys_1.selectAdditionalKeys)(value, known, patterns);
                 if (extra.length === 0)
                     return types_1.PASS;
                 const runner = runners[0];

package/dist/plugins/object-additional-properties/object-additional-properties-schema.mjs

@@ -9,6 +9,7 @@
 import { PASS, fail, isPlainObject, isStringArray } from "../../types/index.mjs";
 import { branch, composite } from "../../plugin-kit/create-rule.mjs";
 import { definePlugin } from "../../plugin-kit/plugin-definition.mjs";
+import { compilePatterns, selectAdditionalKeys, } from "./select-additional-keys.mjs";
 /**
  * WHICH argument positions carry a sub-chain cannot be recovered from a
  * plugin's type at run time — a NarrowedChain and a RootPredicate are both
@@ -21,8 +22,9 @@ export const objectAdditionalPropertiesSchemaPlugin =
     name: "objectAdditionalPropertiesSchema",
     method: "additionalPropertiesSchema",
     slots: ["object"],
-    build: (ctx, schema, allowedProperties) => {
+    build: (ctx, schema, allowedProperties, allowedPatterns) => {
         const known = new Set(allowedProperties ?? ctx.declaredSiblingKeys);
+        const patterns = compilePatterns(allowedPatterns);
         const branches = [
             branch("additional", schema),
         ];
@@ -34,7 +36,7 @@ export const objectAdditionalPropertiesSchemaPlugin =
             combine: (runners) => (value, runCtx) => {
                 if (!isPlainObject(value))
                     return PASS;
-                const extra = Object.keys(value).filter((key) => !known.has(key));
+                const extra = selectAdditionalKeys(value, known, patterns);
                 if (extra.length === 0)
                     return PASS;
                 const runner = runners[0];

package/dist/plugins/object-additional-properties/object-additional-properties.d.ts

@@ -3,7 +3,7 @@ export interface UnexpectedPropertiesExtra {
     readonly extraProperties: readonly string[];
 }
 export declare const objectAdditionalPropertiesPlugin: import("../../plugin-kit/plugin-definition").PluginDefinition<"objectAdditionalProperties", "additionalProperties", readonly ["object"], {
-    args: readonly [allowed: boolean, allowedProperties?: readonly string[]];
+    args: readonly [allowed: boolean, allowedProperties?: readonly string[], allowedPatterns?: readonly string[]];
     out: Unchanged;
     context: UnexpectedPropertiesExtra;
 }>;

package/dist/plugins/object-additional-properties/object-additional-properties.js

@@ -13,12 +13,14 @@ exports.objectAdditionalPropertiesPlugin = void 0;
 const types_1 = require("../../types");
 const create_rule_1 = require("../../plugin-kit/create-rule");
 const plugin_definition_1 = require("../../plugin-kit/plugin-definition");
+const select_additional_keys_1 = require("./select-additional-keys");
 exports.objectAdditionalPropertiesPlugin = (0, plugin_definition_1.definePlugin)()({
     name: "objectAdditionalProperties",
     method: "additionalProperties",
     slots: ["object"],
-    build: (ctx, allowed, allowedProperties) => {
+    build: (ctx, allowed, allowedProperties, allowedPatterns) => {
         const known = new Set(allowedProperties ?? ctx.declaredSiblingKeys);
+        const patterns = (0, select_additional_keys_1.compilePatterns)(allowedPatterns);
         return (0, create_rule_1.check)({
             code: ctx.code,
             messageFactory: ctx.messageFactory,
@@ -28,7 +30,7 @@ exports.objectAdditionalPropertiesPlugin = (0, plugin_definition_1.definePlugin)
                     return types_1.PASS;
                 if (!(0, types_1.isPlainObject)(value))
                     return types_1.PASS;
-                const extra = Object.keys(value).filter((key) => !known.has(key));
+                const extra = (0, select_additional_keys_1.selectAdditionalKeys)(value, known, patterns);
                 return extra.length === 0 ? types_1.PASS : (0, types_1.fail)({ actual: extra });
             },
             describe: (detail) => `Unexpected properties: ${String(detail.actual)}`,

package/dist/plugins/object-additional-properties/object-additional-properties.mjs

@@ -10,12 +10,14 @@
 import { PASS, fail, isPlainObject, isStringArray } from "../../types/index.mjs";
 import { check } from "../../plugin-kit/create-rule.mjs";
 import { definePlugin } from "../../plugin-kit/plugin-definition.mjs";
+import { compilePatterns, selectAdditionalKeys, } from "./select-additional-keys.mjs";
 export const objectAdditionalPropertiesPlugin = /*#__PURE__*/ definePlugin()({
     name: "objectAdditionalProperties",
     method: "additionalProperties",
     slots: ["object"],
-    build: (ctx, allowed, allowedProperties) => {
+    build: (ctx, allowed, allowedProperties, allowedPatterns) => {
         const known = new Set(allowedProperties ?? ctx.declaredSiblingKeys);
+        const patterns = compilePatterns(allowedPatterns);
         return check({
             code: ctx.code,
             messageFactory: ctx.messageFactory,
@@ -25,7 +27,7 @@ export const objectAdditionalPropertiesPlugin = /*#__PURE__*/ definePlugin()({
                     return PASS;
                 if (!isPlainObject(value))
                     return PASS;
-                const extra = Object.keys(value).filter((key) => !known.has(key));
+                const extra = selectAdditionalKeys(value, known, patterns);
                 return extra.length === 0 ? PASS : fail({ actual: extra });
             },
             describe: (detail) => `Unexpected properties: ${String(detail.actual)}`,

package/dist/plugins/object-additional-properties/select-additional-keys.d.ts

@@ -0,0 +1,15 @@
+/**
+ * パターンは build 時に一度だけコンパイルする。実行時は回すだけ、という
+ * 設計に合わせるためで、キーごとに new RegExp すると O(キー数 x パターン数)
+ * のコンパイルが毎回走る。
+ *
+ * 壊れた正規表現は無視する。スキーマ側の誤りでビルド全体を落とすより、
+ * そのパターンが誰にも一致しないほうがまし (Draft-07 は ECMA-262 の
+ * 正規表現を求めるが、方言差で通らないものが現実には来る)。
+ */
+export declare function compilePatterns(patterns: readonly string[] | undefined): readonly RegExp[];
+/**
+ * 宣言済みのキー名にも、どのパターンにも該当しないキーを返す。
+ * 返る配列は入力の列挙順を保つ (issue のメッセージが安定する)。
+ */
+export declare function selectAdditionalKeys(value: Readonly<Record<string, unknown>>, known: ReadonlySet<string>, patterns: readonly RegExp[]): readonly string[];

package/dist/plugins/object-additional-properties/select-additional-keys.js

@@ -0,0 +1,51 @@
+"use strict";
+// ===========================================================================
+// L7  src/plugins/object-additional-properties/select-additional-keys.ts
+//
+// 「additional なキー」を選ぶ規則。boolean 形とスキーマ形の両方が使う。
+//
+// Draft-07 §6.5.4 は additionalProperties の対象を「properties にも
+// patternProperties にも該当しないキー」と定めている。パターンを見落とすと
+// `{"patternProperties":{"^v":{}},"additionalProperties":false}` が
+// {"vroom":2} を誤って拒否する (スイートの
+// "patternProperties are not additional properties" がそれを突く)。
+// ===========================================================================
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compilePatterns = compilePatterns;
+exports.selectAdditionalKeys = selectAdditionalKeys;
+/**
+ * パターンは build 時に一度だけコンパイルする。実行時は回すだけ、という
+ * 設計に合わせるためで、キーごとに new RegExp すると O(キー数 x パターン数)
+ * のコンパイルが毎回走る。
+ *
+ * 壊れた正規表現は無視する。スキーマ側の誤りでビルド全体を落とすより、
+ * そのパターンが誰にも一致しないほうがまし (Draft-07 は ECMA-262 の
+ * 正規表現を求めるが、方言差で通らないものが現実には来る)。
+ */
+function compilePatterns(patterns) {
+    if (patterns === undefined || patterns.length === 0)
+        return Object.freeze([]);
+    const compiled = [];
+    for (const pattern of patterns) {
+        try {
+            compiled.push(new RegExp(pattern, "u"));
+        }
+        catch {
+            try {
+                // "u" が付くと通らない書き方が現実にはある。付けずにもう一度試す。
+                compiled.push(new RegExp(pattern));
+            }
+            catch {
+                // どちらでも駄目なら、このパターンは一致しないものとして扱う。
+            }
+        }
+    }
+    return Object.freeze(compiled);
+}
+/**
+ * 宣言済みのキー名にも、どのパターンにも該当しないキーを返す。
+ * 返る配列は入力の列挙順を保つ (issue のメッセージが安定する)。
+ */
+function selectAdditionalKeys(value, known, patterns) {
+    return Object.keys(value).filter((key) => !known.has(key) && !patterns.some((pattern) => pattern.test(key)));
+}

package/dist/plugins/object-additional-properties/select-additional-keys.mjs

@@ -0,0 +1,47 @@
+// ===========================================================================
+// L7  src/plugins/object-additional-properties/select-additional-keys.ts
+//
+// 「additional なキー」を選ぶ規則。boolean 形とスキーマ形の両方が使う。
+//
+// Draft-07 §6.5.4 は additionalProperties の対象を「properties にも
+// patternProperties にも該当しないキー」と定めている。パターンを見落とすと
+// `{"patternProperties":{"^v":{}},"additionalProperties":false}` が
+// {"vroom":2} を誤って拒否する (スイートの
+// "patternProperties are not additional properties" がそれを突く)。
+// ===========================================================================
+/**
+ * パターンは build 時に一度だけコンパイルする。実行時は回すだけ、という
+ * 設計に合わせるためで、キーごとに new RegExp すると O(キー数 x パターン数)
+ * のコンパイルが毎回走る。
+ *
+ * 壊れた正規表現は無視する。スキーマ側の誤りでビルド全体を落とすより、
+ * そのパターンが誰にも一致しないほうがまし (Draft-07 は ECMA-262 の
+ * 正規表現を求めるが、方言差で通らないものが現実には来る)。
+ */
+export function compilePatterns(patterns) {
+    if (patterns === undefined || patterns.length === 0)
+        return Object.freeze([]);
+    const compiled = [];
+    for (const pattern of patterns) {
+        try {
+            compiled.push(new RegExp(pattern, "u"));
+        }
+        catch {
+            try {
+                // "u" が付くと通らない書き方が現実にはある。付けずにもう一度試す。
+                compiled.push(new RegExp(pattern));
+            }
+            catch {
+                // どちらでも駄目なら、このパターンは一致しないものとして扱う。
+            }
+        }
+    }
+    return Object.freeze(compiled);
+}
+/**
+ * 宣言済みのキー名にも、どのパターンにも該当しないキーを返す。
+ * 返る配列は入力の列挙順を保つ (issue のメッセージが安定する)。
+ */
+export function selectAdditionalKeys(value, known, patterns) {
+    return Object.keys(value).filter((key) => !known.has(key) && !patterns.some((pattern) => pattern.test(key)));
+}