@algorandfoundation/algokit-client-generator 4.0.0-beta.1 → 4.0.0-beta.10

package/schema/arc56.schema.json.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"arc56.schema.json.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"arc56.schema.json.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/schema/load.js

@@ -11,7 +11,13 @@ async function loadApplicationJson(appJsonPath) {
     const fs = await import('fs');
     if (!fs.existsSync(appJsonPath))
         boom.boom(`Could not find application.json file at ${appJsonPath}`);
-    const file = JSON.parse(fs.readFileSync(appJsonPath, 'utf-8'));
+    let jsonText = fs.readFileSync(appJsonPath, 'utf-8');
+    let file = JSON.parse(jsonText);
+    // Temporary to get backwards compatibility with TEALScript draft ARC-56
+    if (!('contract' in file) /* ARC-56 */) {
+        jsonText = jsonText.replace(/ype":\s*"bytes"/g, 'ype":"AVMBytes"').replace(/import\(.+?\)\./g, '');
+        file = JSON.parse(jsonText);
+    }
     return validateApplicationJson(file, appJsonPath);
 }
 function validateApplicationJson(json, appJsonPath) {

package/schema/load.js.map

@@ -1 +1 @@
-{"version":3,"file":"load.js","sources":["../../src/schema/load.ts"],"sourcesContent":["import { Schema, Validator } from 'jsonschema'\nimport { boom } from '../util/boom'\nimport arc32Schema from './application.schema.json' with { type: 'json' }\nimport arc56Schema from './arc56.schema.json' with { type: 'json' }\nimport contractSchema from './contract.schema.json' with { type: 'json' }\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { AppSpec, arc32ToArc56 } from '@algorandfoundation/algokit-utils/types/app-spec'\n\nexport async function loadApplicationJson(appJsonPath: string): Promise<Arc56Contract> {\n  const fs = await import('fs')\n  if (!fs.existsSync(appJsonPath)) boom(`Could not find application.json file at ${appJsonPath}`)\n\n  const file = JSON.parse(fs.readFileSync(appJsonPath, 'utf-8'))\n  return validateApplicationJson(file, appJsonPath)\n}\n\nexport function validateApplicationJson(json: unknown, appJsonPath: string): Arc56Contract {\n  if (typeof json !== 'object') boom(`Could not parse ${appJsonPath} as JSON object`)\n\n  /* eslint-disable @typescript-eslint/no-explicit-any */\n  if ('contract' in (json as any)) {\n    // ARC-32\n    const arc32Validator = new Validator()\n    arc32Validator.addSchema(contractSchema, '/contract.schema.json')\n    const arc32Result = arc32Validator.validate(json, arc32Schema as unknown as Schema)\n    if (!arc32Result.valid) boom(`Could not parse ${appJsonPath} as ARC-32.\\n${arc32Result}`)\n    return arc32ToArc56(json as AppSpec)\n  }\n  // ARC-56\n  const arc56Validator = new Validator()\n  const arc56Result = arc56Validator.validate(json, arc56Schema as unknown as Schema)\n  if (!arc56Result.valid) boom(`Could not parse ${appJsonPath} as ARC-56.\\n${arc56Result}`)\n  return json as Arc56Contract\n}\n"],"names":["boom","Validator","contractSchema","arc32Schema","arc32ToArc56","arc56Schema"],"mappings":";;;;;;;;;AAQO,eAAe,mBAAmB,CAAC,WAAmB,EAAA;AAC3D,IAAA,MAAM,EAAE,GAAG,MAAM,OAAO,IAAI,CAAC,CAAA;AAC7B,IAAA,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;AAAE,QAAAA,SAAI,CAAC,CAAA,wCAAA,EAA2C,WAAW,CAAA,CAAE,CAAC,CAAA;AAE/F,IAAA,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAA;AAC9D,IAAA,OAAO,uBAAuB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AACnD,CAAC;AAEe,SAAA,uBAAuB,CAAC,IAAa,EAAE,WAAmB,EAAA;IACxE,IAAI,OAAO,IAAI,KAAK,QAAQ;AAAE,QAAAA,SAAI,CAAC,CAAA,gBAAA,EAAmB,WAAW,CAAA,eAAA,CAAiB,CAAC,CAAA;;AAGnF,IAAA,IAAI,UAAU,IAAK,IAAY,EAAE;;AAE/B,QAAA,MAAM,cAAc,GAAG,IAAIC,oBAAS,EAAE,CAAA;AACtC,QAAA,cAAc,CAAC,SAAS,CAACC,uBAAc,EAAE,uBAAuB,CAAC,CAAA;QACjE,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAEC,0BAAgC,CAAC,CAAA;QACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,YAAAH,SAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,QAAA,OAAOI,oBAAY,CAAC,IAAe,CAAC,CAAA;KACrC;;AAED,IAAA,MAAM,cAAc,GAAG,IAAIH,oBAAS,EAAE,CAAA;IACtC,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAEI,oBAAgC,CAAC,CAAA;IACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,QAAAL,SAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,IAAA,OAAO,IAAqB,CAAA;AAC9B;;;;;"}
+{"version":3,"file":"load.js","sources":["../../src/schema/load.ts"],"sourcesContent":["import { Schema, Validator } from 'jsonschema'\nimport { boom } from '../util/boom'\nimport arc32Schema from './application.schema.json' with { type: 'json' }\nimport arc56Schema from './arc56.schema.json' with { type: 'json' }\nimport contractSchema from './contract.schema.json' with { type: 'json' }\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { AppSpec, arc32ToArc56 } from '@algorandfoundation/algokit-utils/types/app-spec'\n\nexport async function loadApplicationJson(appJsonPath: string): Promise<Arc56Contract> {\n  const fs = await import('fs')\n  if (!fs.existsSync(appJsonPath)) boom(`Could not find application.json file at ${appJsonPath}`)\n\n  let jsonText = fs.readFileSync(appJsonPath, 'utf-8')\n  let file = JSON.parse(jsonText)\n  // Temporary to get backwards compatibility with TEALScript draft ARC-56\n  if (!('contract' in file) /* ARC-56 */) {\n    jsonText = jsonText.replace(/ype\":\\s*\"bytes\"/g, 'ype\":\"AVMBytes\"').replace(/import\\(.+?\\)\\./g, '')\n    file = JSON.parse(jsonText)\n  }\n\n  return validateApplicationJson(file, appJsonPath)\n}\n\nexport function validateApplicationJson(json: unknown, appJsonPath: string): Arc56Contract {\n  if (typeof json !== 'object') boom(`Could not parse ${appJsonPath} as JSON object`)\n\n  /* eslint-disable @typescript-eslint/no-explicit-any */\n  if ('contract' in (json as any)) {\n    // ARC-32\n    const arc32Validator = new Validator()\n    arc32Validator.addSchema(contractSchema, '/contract.schema.json')\n    const arc32Result = arc32Validator.validate(json, arc32Schema as unknown as Schema)\n    if (!arc32Result.valid) boom(`Could not parse ${appJsonPath} as ARC-32.\\n${arc32Result}`)\n    return arc32ToArc56(json as AppSpec)\n  }\n  // ARC-56\n  const arc56Validator = new Validator()\n  const arc56Result = arc56Validator.validate(json, arc56Schema as unknown as Schema)\n  if (!arc56Result.valid) boom(`Could not parse ${appJsonPath} as ARC-56.\\n${arc56Result}`)\n  return json as Arc56Contract\n}\n"],"names":["boom","Validator","contractSchema","arc32Schema","arc32ToArc56","arc56Schema"],"mappings":";;;;;;;;;AAQO,eAAe,mBAAmB,CAAC,WAAmB,EAAA;AAC3D,IAAA,MAAM,EAAE,GAAG,MAAM,OAAO,IAAI,CAAC,CAAA;AAC7B,IAAA,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;AAAE,QAAAA,SAAI,CAAC,CAAA,wCAAA,EAA2C,WAAW,CAAA,CAAE,CAAC,CAAA;IAE/F,IAAI,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IACpD,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;;IAE/B,IAAI,EAAE,UAAU,IAAI,IAAI,CAAC,eAAe;AACtC,QAAA,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;AAClG,QAAA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;KAC5B;AAED,IAAA,OAAO,uBAAuB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AACnD,CAAC;AAEe,SAAA,uBAAuB,CAAC,IAAa,EAAE,WAAmB,EAAA;IACxE,IAAI,OAAO,IAAI,KAAK,QAAQ;AAAE,QAAAA,SAAI,CAAC,CAAA,gBAAA,EAAmB,WAAW,CAAA,eAAA,CAAiB,CAAC,CAAA;;AAGnF,IAAA,IAAI,UAAU,IAAK,IAAY,EAAE;;AAE/B,QAAA,MAAM,cAAc,GAAG,IAAIC,oBAAS,EAAE,CAAA;AACtC,QAAA,cAAc,CAAC,SAAS,CAACC,uBAAc,EAAE,uBAAuB,CAAC,CAAA;QACjE,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAEC,0BAAgC,CAAC,CAAA;QACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,YAAAH,SAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,QAAA,OAAOI,oBAAY,CAAC,IAAe,CAAC,CAAA;KACrC;;AAED,IAAA,MAAM,cAAc,GAAG,IAAIH,oBAAS,EAAE,CAAA;IACtC,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAEI,oBAAgC,CAAC,CAAA;IACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,QAAAL,SAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,IAAA,OAAO,IAAqB,CAAA;AAC9B;;;;;"}

package/schema/load.mjs

@@ -9,7 +9,13 @@ async function loadApplicationJson(appJsonPath) {
     const fs = await import('fs');
     if (!fs.existsSync(appJsonPath))
         boom(`Could not find application.json file at ${appJsonPath}`);
-    const file = JSON.parse(fs.readFileSync(appJsonPath, 'utf-8'));
+    let jsonText = fs.readFileSync(appJsonPath, 'utf-8');
+    let file = JSON.parse(jsonText);
+    // Temporary to get backwards compatibility with TEALScript draft ARC-56
+    if (!('contract' in file) /* ARC-56 */) {
+        jsonText = jsonText.replace(/ype":\s*"bytes"/g, 'ype":"AVMBytes"').replace(/import\(.+?\)\./g, '');
+        file = JSON.parse(jsonText);
+    }
     return validateApplicationJson(file, appJsonPath);
 }
 function validateApplicationJson(json, appJsonPath) {

package/schema/load.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"load.mjs","sources":["../../src/schema/load.ts"],"sourcesContent":["import { Schema, Validator } from 'jsonschema'\nimport { boom } from '../util/boom'\nimport arc32Schema from './application.schema.json' with { type: 'json' }\nimport arc56Schema from './arc56.schema.json' with { type: 'json' }\nimport contractSchema from './contract.schema.json' with { type: 'json' }\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { AppSpec, arc32ToArc56 } from '@algorandfoundation/algokit-utils/types/app-spec'\n\nexport async function loadApplicationJson(appJsonPath: string): Promise<Arc56Contract> {\n  const fs = await import('fs')\n  if (!fs.existsSync(appJsonPath)) boom(`Could not find application.json file at ${appJsonPath}`)\n\n  const file = JSON.parse(fs.readFileSync(appJsonPath, 'utf-8'))\n  return validateApplicationJson(file, appJsonPath)\n}\n\nexport function validateApplicationJson(json: unknown, appJsonPath: string): Arc56Contract {\n  if (typeof json !== 'object') boom(`Could not parse ${appJsonPath} as JSON object`)\n\n  /* eslint-disable @typescript-eslint/no-explicit-any */\n  if ('contract' in (json as any)) {\n    // ARC-32\n    const arc32Validator = new Validator()\n    arc32Validator.addSchema(contractSchema, '/contract.schema.json')\n    const arc32Result = arc32Validator.validate(json, arc32Schema as unknown as Schema)\n    if (!arc32Result.valid) boom(`Could not parse ${appJsonPath} as ARC-32.\\n${arc32Result}`)\n    return arc32ToArc56(json as AppSpec)\n  }\n  // ARC-56\n  const arc56Validator = new Validator()\n  const arc56Result = arc56Validator.validate(json, arc56Schema as unknown as Schema)\n  if (!arc56Result.valid) boom(`Could not parse ${appJsonPath} as ARC-56.\\n${arc56Result}`)\n  return json as Arc56Contract\n}\n"],"names":[],"mappings":";;;;;;;AAQO,eAAe,mBAAmB,CAAC,WAAmB,EAAA;AAC3D,IAAA,MAAM,EAAE,GAAG,MAAM,OAAO,IAAI,CAAC,CAAA;AAC7B,IAAA,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;AAAE,QAAA,IAAI,CAAC,CAAA,wCAAA,EAA2C,WAAW,CAAA,CAAE,CAAC,CAAA;AAE/F,IAAA,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAA;AAC9D,IAAA,OAAO,uBAAuB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AACnD,CAAC;AAEe,SAAA,uBAAuB,CAAC,IAAa,EAAE,WAAmB,EAAA;IACxE,IAAI,OAAO,IAAI,KAAK,QAAQ;AAAE,QAAA,IAAI,CAAC,CAAA,gBAAA,EAAmB,WAAW,CAAA,eAAA,CAAiB,CAAC,CAAA;;AAGnF,IAAA,IAAI,UAAU,IAAK,IAAY,EAAE;;AAE/B,QAAA,MAAM,cAAc,GAAG,IAAI,SAAS,EAAE,CAAA;AACtC,QAAA,cAAc,CAAC,SAAS,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAA;QACjE,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAgC,CAAC,CAAA;QACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,YAAA,IAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,QAAA,OAAO,YAAY,CAAC,IAAe,CAAC,CAAA;KACrC;;AAED,IAAA,MAAM,cAAc,GAAG,IAAI,SAAS,EAAE,CAAA;IACtC,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAgC,CAAC,CAAA;IACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,QAAA,IAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,IAAA,OAAO,IAAqB,CAAA;AAC9B;;;;"}
+{"version":3,"file":"load.mjs","sources":["../../src/schema/load.ts"],"sourcesContent":["import { Schema, Validator } from 'jsonschema'\nimport { boom } from '../util/boom'\nimport arc32Schema from './application.schema.json' with { type: 'json' }\nimport arc56Schema from './arc56.schema.json' with { type: 'json' }\nimport contractSchema from './contract.schema.json' with { type: 'json' }\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { AppSpec, arc32ToArc56 } from '@algorandfoundation/algokit-utils/types/app-spec'\n\nexport async function loadApplicationJson(appJsonPath: string): Promise<Arc56Contract> {\n  const fs = await import('fs')\n  if (!fs.existsSync(appJsonPath)) boom(`Could not find application.json file at ${appJsonPath}`)\n\n  let jsonText = fs.readFileSync(appJsonPath, 'utf-8')\n  let file = JSON.parse(jsonText)\n  // Temporary to get backwards compatibility with TEALScript draft ARC-56\n  if (!('contract' in file) /* ARC-56 */) {\n    jsonText = jsonText.replace(/ype\":\\s*\"bytes\"/g, 'ype\":\"AVMBytes\"').replace(/import\\(.+?\\)\\./g, '')\n    file = JSON.parse(jsonText)\n  }\n\n  return validateApplicationJson(file, appJsonPath)\n}\n\nexport function validateApplicationJson(json: unknown, appJsonPath: string): Arc56Contract {\n  if (typeof json !== 'object') boom(`Could not parse ${appJsonPath} as JSON object`)\n\n  /* eslint-disable @typescript-eslint/no-explicit-any */\n  if ('contract' in (json as any)) {\n    // ARC-32\n    const arc32Validator = new Validator()\n    arc32Validator.addSchema(contractSchema, '/contract.schema.json')\n    const arc32Result = arc32Validator.validate(json, arc32Schema as unknown as Schema)\n    if (!arc32Result.valid) boom(`Could not parse ${appJsonPath} as ARC-32.\\n${arc32Result}`)\n    return arc32ToArc56(json as AppSpec)\n  }\n  // ARC-56\n  const arc56Validator = new Validator()\n  const arc56Result = arc56Validator.validate(json, arc56Schema as unknown as Schema)\n  if (!arc56Result.valid) boom(`Could not parse ${appJsonPath} as ARC-56.\\n${arc56Result}`)\n  return json as Arc56Contract\n}\n"],"names":[],"mappings":";;;;;;;AAQO,eAAe,mBAAmB,CAAC,WAAmB,EAAA;AAC3D,IAAA,MAAM,EAAE,GAAG,MAAM,OAAO,IAAI,CAAC,CAAA;AAC7B,IAAA,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;AAAE,QAAA,IAAI,CAAC,CAAA,wCAAA,EAA2C,WAAW,CAAA,CAAE,CAAC,CAAA;IAE/F,IAAI,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IACpD,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;;IAE/B,IAAI,EAAE,UAAU,IAAI,IAAI,CAAC,eAAe;AACtC,QAAA,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;AAClG,QAAA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;KAC5B;AAED,IAAA,OAAO,uBAAuB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AACnD,CAAC;AAEe,SAAA,uBAAuB,CAAC,IAAa,EAAE,WAAmB,EAAA;IACxE,IAAI,OAAO,IAAI,KAAK,QAAQ;AAAE,QAAA,IAAI,CAAC,CAAA,gBAAA,EAAmB,WAAW,CAAA,eAAA,CAAiB,CAAC,CAAA;;AAGnF,IAAA,IAAI,UAAU,IAAK,IAAY,EAAE;;AAE/B,QAAA,MAAM,cAAc,GAAG,IAAI,SAAS,EAAE,CAAA;AACtC,QAAA,cAAc,CAAC,SAAS,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAA;QACjE,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAgC,CAAC,CAAA;QACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,YAAA,IAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,QAAA,OAAO,YAAY,CAAC,IAAe,CAAC,CAAA;KACrC;;AAED,IAAA,MAAM,cAAc,GAAG,IAAI,SAAS,EAAE,CAAA;IACtC,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAgC,CAAC,CAAA;IACnF,IAAI,CAAC,WAAW,CAAC,KAAK;AAAE,QAAA,IAAI,CAAC,CAAmB,gBAAA,EAAA,WAAW,gBAAgB,WAAW,CAAA,CAAE,CAAC,CAAA;AACzF,IAAA,OAAO,IAAqB,CAAA;AAC9B;;;;"}

package/util/sanitization.js

@@ -4,27 +4,32 @@ var changeCase = require('change-case');
 
 const replaceInvalidWithUnderscore = (value) => value.replace(/[^a-z0-9_$]+/gi, '_');
 const escapeQuotes = (value) => value.replace(/['"]/g, (val) => `\\${val}`);
+const removeEnclosingQuotes = (value) => value.replace(/^"|"$/g, '');
 const defaultSanitiser = {
     makeSafePropertyIdentifier(value) {
-        return changeCase.camelCase(replaceInvalidWithUnderscore(value));
+        const options = value.startsWith('_') ? { prefixCharacters: '_' } : {};
+        return changeCase.camelCase(replaceInvalidWithUnderscore(value), options);
     },
     makeSafeTypeIdentifier(value) {
-        return changeCase.pascalCase(replaceInvalidWithUnderscore(value));
+        const options = value.startsWith('_') ? { prefixCharacters: '_' } : {};
+        return changeCase.pascalCase(replaceInvalidWithUnderscore(value), options);
     },
     makeSafeMethodIdentifier(value) {
-        return changeCase.camelCase(replaceInvalidWithUnderscore(value));
+        const options = value.startsWith('_') ? { prefixCharacters: '_' } : {};
+        return changeCase.camelCase(replaceInvalidWithUnderscore(value), options);
     },
     isSafeVariableIdentifier(value) {
         return /^[a-z$_][a-z0-9_$]*$/i.test(value);
     },
     makeSafeVariableIdentifier(value) {
-        return changeCase.camelCase(replaceInvalidWithUnderscore(value));
+        const options = value.startsWith('_') ? { prefixCharacters: '_' } : {};
+        return changeCase.camelCase(replaceInvalidWithUnderscore(value), options);
     },
     makeSafeStringTypeLiteral(value) {
         return escapeQuotes(value);
     },
     getSafeMemberAccessor(value) {
-        return this.isSafeVariableIdentifier(value) ? `.${value}` : `[${value}]`;
+        return this.isSafeVariableIdentifier(value) ? `.${value}` : `['${this.makeSafeStringTypeLiteral(value)}']`;
     },
 };
 const preservingSanitiser = {
@@ -32,10 +37,10 @@ const preservingSanitiser = {
         return /^[a-z$_][a-z0-9_$]*$/i.test(value);
     },
     makeSafeMethodIdentifier(value) {
-        return this.isSafeVariableIdentifier(value) ? value : `"${escapeQuotes(value)}"`;
+        return this.isSafeVariableIdentifier(value) ? value : `"${this.makeSafeStringTypeLiteral(value)}"`;
     },
     makeSafePropertyIdentifier(value) {
-        return this.isSafeVariableIdentifier(value) ? value : `"${escapeQuotes(value)}"`;
+        return this.isSafeVariableIdentifier(value) ? value : `"${this.makeSafeStringTypeLiteral(value)}"`;
     },
     makeSafeTypeIdentifier(value) {
         return replaceInvalidWithUnderscore(value);
@@ -47,7 +52,7 @@ const preservingSanitiser = {
         return escapeQuotes(value);
     },
     getSafeMemberAccessor(value) {
-        return this.isSafeVariableIdentifier(value) ? `.${value}` : `[${value}]`;
+        return this.isSafeVariableIdentifier(value) ? `.${value}` : `['${removeEnclosingQuotes(value)}']`;
     },
 };
 const getSanitizer = ({ preserveNames }) => (preserveNames ? preservingSanitiser : defaultSanitiser);

package/util/sanitization.js.map

@@ -1 +1 @@
-{"version":3,"file":"sanitization.js","sources":["../../src/util/sanitization.ts"],"sourcesContent":["import { camelCase, pascalCase } from 'change-case'\n\nconst replaceInvalidWithUnderscore = (value: string) => value.replace(/[^a-z0-9_$]+/gi, '_')\n\nconst escapeQuotes = (value: string) => value.replace(/['\"]/g, (val) => `\\\\${val}`)\n\nexport interface Sanitizer {\n  makeSafeTypeIdentifier(value: string): string\n  makeSafeMethodIdentifier(value: string): string\n  makeSafeVariableIdentifier(value: string): string\n  makeSafePropertyIdentifier(value: string): string\n  makeSafeStringTypeLiteral(value: string): string\n  getSafeMemberAccessor(value: string): string\n  isSafeVariableIdentifier(value: string): boolean\n}\n\nconst defaultSanitiser: Sanitizer = {\n  makeSafePropertyIdentifier(value: string) {\n    return camelCase(replaceInvalidWithUnderscore(value))\n  },\n  makeSafeTypeIdentifier(value: string) {\n    return pascalCase(replaceInvalidWithUnderscore(value))\n  },\n  makeSafeMethodIdentifier(value: string) {\n    return camelCase(replaceInvalidWithUnderscore(value))\n  },\n  isSafeVariableIdentifier(value: string) {\n    return /^[a-z$_][a-z0-9_$]*$/i.test(value)\n  },\n  makeSafeVariableIdentifier(value: string) {\n    return camelCase(replaceInvalidWithUnderscore(value))\n  },\n  makeSafeStringTypeLiteral(value: string): string {\n    return escapeQuotes(value)\n  },\n  getSafeMemberAccessor(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? `.${value}` : `[${value}]`\n  },\n}\n\nconst preservingSanitiser: Sanitizer = {\n  isSafeVariableIdentifier(value: string): boolean {\n    return /^[a-z$_][a-z0-9_$]*$/i.test(value)\n  },\n  makeSafeMethodIdentifier(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? value : `\"${escapeQuotes(value)}\"`\n  },\n  makeSafePropertyIdentifier(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? value : `\"${escapeQuotes(value)}\"`\n  },\n  makeSafeTypeIdentifier(value: string): string {\n    return replaceInvalidWithUnderscore(value)\n  },\n  makeSafeVariableIdentifier(value: string): string {\n    return replaceInvalidWithUnderscore(value)\n  },\n  makeSafeStringTypeLiteral(value: string): string {\n    return escapeQuotes(value)\n  },\n  getSafeMemberAccessor(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? `.${value}` : `[${value}]`\n  },\n}\n\nexport const getSanitizer = ({ preserveNames }: { preserveNames: boolean }) => (preserveNames ? preservingSanitiser : defaultSanitiser)\n"],"names":["camelCase","pascalCase"],"mappings":";;;;AAEA,MAAM,4BAA4B,GAAG,CAAC,KAAa,KAAK,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAA;AAE5F,MAAM,YAAY,GAAG,CAAC,KAAa,KAAK,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,KAAK,CAAK,EAAA,EAAA,GAAG,CAAE,CAAA,CAAC,CAAA;AAYnF,MAAM,gBAAgB,GAAc;AAClC,IAAA,0BAA0B,CAAC,KAAa,EAAA;AACtC,QAAA,OAAOA,oBAAS,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAA;KACtD;AACD,IAAA,sBAAsB,CAAC,KAAa,EAAA;AAClC,QAAA,OAAOC,qBAAU,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAA;KACvD;AACD,IAAA,wBAAwB,CAAC,KAAa,EAAA;AACpC,QAAA,OAAOD,oBAAS,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAA;KACtD;AACD,IAAA,wBAAwB,CAAC,KAAa,EAAA;AACpC,QAAA,OAAO,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KAC3C;AACD,IAAA,0BAA0B,CAAC,KAAa,EAAA;AACtC,QAAA,OAAOA,oBAAS,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAA;KACtD;AACD,IAAA,yBAAyB,CAAC,KAAa,EAAA;AACrC,QAAA,OAAO,YAAY,CAAC,KAAK,CAAC,CAAA;KAC3B;AACD,IAAA,qBAAqB,CAAC,KAAa,EAAA;AACjC,QAAA,OAAO,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAI,CAAA,EAAA,KAAK,EAAE,GAAG,CAAI,CAAA,EAAA,KAAK,GAAG,CAAA;KACzE;CACF,CAAA;AAED,MAAM,mBAAmB,GAAc;AACrC,IAAA,wBAAwB,CAAC,KAAa,EAAA;AACpC,QAAA,OAAO,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KAC3C;AACD,IAAA,wBAAwB,CAAC,KAAa,EAAA;AACpC,QAAA,OAAO,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,CAAI,CAAA,EAAA,YAAY,CAAC,KAAK,CAAC,GAAG,CAAA;KACjF;AACD,IAAA,0BAA0B,CAAC,KAAa,EAAA;AACtC,QAAA,OAAO,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,CAAI,CAAA,EAAA,YAAY,CAAC,KAAK,CAAC,GAAG,CAAA;KACjF;AACD,IAAA,sBAAsB,CAAC,KAAa,EAAA;AAClC,QAAA,OAAO,4BAA4B,CAAC,KAAK,CAAC,CAAA;KAC3C;AACD,IAAA,0BAA0B,CAAC,KAAa,EAAA;AACtC,QAAA,OAAO,4BAA4B,CAAC,KAAK,CAAC,CAAA;KAC3C;AACD,IAAA,yBAAyB,CAAC,KAAa,EAAA;AACrC,QAAA,OAAO,YAAY,CAAC,KAAK,CAAC,CAAA;KAC3B;AACD,IAAA,qBAAqB,CAAC,KAAa,EAAA;AACjC,QAAA,OAAO,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAI,CAAA,EAAA,KAAK,EAAE,GAAG,CAAI,CAAA,EAAA,KAAK,GAAG,CAAA;KACzE;CACF,CAAA;MAEY,YAAY,GAAG,CAAC,EAAE,aAAa,EAA8B,MAAM,aAAa,GAAG,mBAAmB,GAAG,gBAAgB;;;;"}
+{"version":3,"file":"sanitization.js","sources":["../../src/util/sanitization.ts"],"sourcesContent":["import { camelCase, pascalCase } from 'change-case'\n\nconst replaceInvalidWithUnderscore = (value: string) => value.replace(/[^a-z0-9_$]+/gi, '_')\n\nconst escapeQuotes = (value: string) => value.replace(/['\"]/g, (val) => `\\\\${val}`)\n\nconst removeEnclosingQuotes = (value: string) => value.replace(/^\"|\"$/g, '')\n\nexport interface Sanitizer {\n  makeSafeTypeIdentifier(value: string): string\n  makeSafeMethodIdentifier(value: string): string\n  makeSafeVariableIdentifier(value: string): string\n  makeSafePropertyIdentifier(value: string): string\n  makeSafeStringTypeLiteral(value: string): string\n  getSafeMemberAccessor(value: string): string\n  isSafeVariableIdentifier(value: string): boolean\n}\n\nconst defaultSanitiser: Sanitizer = {\n  makeSafePropertyIdentifier(value: string) {\n    const options = value.startsWith('_') ? { prefixCharacters: '_' } : {}\n    return camelCase(replaceInvalidWithUnderscore(value), options)\n  },\n  makeSafeTypeIdentifier(value: string) {\n    const options = value.startsWith('_') ? { prefixCharacters: '_' } : {}\n    return pascalCase(replaceInvalidWithUnderscore(value), options)\n  },\n  makeSafeMethodIdentifier(value: string) {\n    const options = value.startsWith('_') ? { prefixCharacters: '_' } : {}\n    return camelCase(replaceInvalidWithUnderscore(value), options)\n  },\n  isSafeVariableIdentifier(value: string) {\n    return /^[a-z$_][a-z0-9_$]*$/i.test(value)\n  },\n  makeSafeVariableIdentifier(value: string) {\n    const options = value.startsWith('_') ? { prefixCharacters: '_' } : {}\n    return camelCase(replaceInvalidWithUnderscore(value), options)\n  },\n  makeSafeStringTypeLiteral(value: string): string {\n    return escapeQuotes(value)\n  },\n  getSafeMemberAccessor(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? `.${value}` : `['${this.makeSafeStringTypeLiteral(value)}']`\n  },\n}\n\nconst preservingSanitiser: Sanitizer = {\n  isSafeVariableIdentifier(value: string): boolean {\n    return /^[a-z$_][a-z0-9_$]*$/i.test(value)\n  },\n  makeSafeMethodIdentifier(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? value : `\"${this.makeSafeStringTypeLiteral(value)}\"`\n  },\n  makeSafePropertyIdentifier(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? value : `\"${this.makeSafeStringTypeLiteral(value)}\"`\n  },\n  makeSafeTypeIdentifier(value: string): string {\n    return replaceInvalidWithUnderscore(value)\n  },\n  makeSafeVariableIdentifier(value: string): string {\n    return replaceInvalidWithUnderscore(value)\n  },\n  makeSafeStringTypeLiteral(value: string): string {\n    return escapeQuotes(value)\n  },\n  getSafeMemberAccessor(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? `.${value}` : `['${removeEnclosingQuotes(value)}']`\n  },\n}\n\nexport const getSanitizer = ({ preserveNames }: { preserveNames: boolean }) => (preserveNames ? preservingSanitiser : defaultSanitiser)\n"],"names":["camelCase","pascalCase"],"mappings":"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"}

package/util/sanitization.mjs

@@ -2,27 +2,32 @@ import { camelCase, pascalCase } from 'change-case';
 
 const replaceInvalidWithUnderscore = (value) => value.replace(/[^a-z0-9_$]+/gi, '_');
 const escapeQuotes = (value) => value.replace(/['"]/g, (val) => `\\${val}`);
+const removeEnclosingQuotes = (value) => value.replace(/^"|"$/g, '');
 const defaultSanitiser = {
     makeSafePropertyIdentifier(value) {
-        return camelCase(replaceInvalidWithUnderscore(value));
+        const options = value.startsWith('_') ? { prefixCharacters: '_' } : {};
+        return camelCase(replaceInvalidWithUnderscore(value), options);
     },
     makeSafeTypeIdentifier(value) {
-        return pascalCase(replaceInvalidWithUnderscore(value));
+        const options = value.startsWith('_') ? { prefixCharacters: '_' } : {};
+        return pascalCase(replaceInvalidWithUnderscore(value), options);
     },
     makeSafeMethodIdentifier(value) {
-        return camelCase(replaceInvalidWithUnderscore(value));
+        const options = value.startsWith('_') ? { prefixCharacters: '_' } : {};
+        return camelCase(replaceInvalidWithUnderscore(value), options);
     },
     isSafeVariableIdentifier(value) {
         return /^[a-z$_][a-z0-9_$]*$/i.test(value);
     },
     makeSafeVariableIdentifier(value) {
-        return camelCase(replaceInvalidWithUnderscore(value));
+        const options = value.startsWith('_') ? { prefixCharacters: '_' } : {};
+        return camelCase(replaceInvalidWithUnderscore(value), options);
     },
     makeSafeStringTypeLiteral(value) {
         return escapeQuotes(value);
     },
     getSafeMemberAccessor(value) {
-        return this.isSafeVariableIdentifier(value) ? `.${value}` : `[${value}]`;
+        return this.isSafeVariableIdentifier(value) ? `.${value}` : `['${this.makeSafeStringTypeLiteral(value)}']`;
     },
 };
 const preservingSanitiser = {
@@ -30,10 +35,10 @@ const preservingSanitiser = {
         return /^[a-z$_][a-z0-9_$]*$/i.test(value);
     },
     makeSafeMethodIdentifier(value) {
-        return this.isSafeVariableIdentifier(value) ? value : `"${escapeQuotes(value)}"`;
+        return this.isSafeVariableIdentifier(value) ? value : `"${this.makeSafeStringTypeLiteral(value)}"`;
     },
     makeSafePropertyIdentifier(value) {
-        return this.isSafeVariableIdentifier(value) ? value : `"${escapeQuotes(value)}"`;
+        return this.isSafeVariableIdentifier(value) ? value : `"${this.makeSafeStringTypeLiteral(value)}"`;
     },
     makeSafeTypeIdentifier(value) {
         return replaceInvalidWithUnderscore(value);
@@ -45,7 +50,7 @@ const preservingSanitiser = {
         return escapeQuotes(value);
     },
     getSafeMemberAccessor(value) {
-        return this.isSafeVariableIdentifier(value) ? `.${value}` : `[${value}]`;
+        return this.isSafeVariableIdentifier(value) ? `.${value}` : `['${removeEnclosingQuotes(value)}']`;
     },
 };
 const getSanitizer = ({ preserveNames }) => (preserveNames ? preservingSanitiser : defaultSanitiser);

package/util/sanitization.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"sanitization.mjs","sources":["../../src/util/sanitization.ts"],"sourcesContent":["import { camelCase, pascalCase } from 'change-case'\n\nconst replaceInvalidWithUnderscore = (value: string) => value.replace(/[^a-z0-9_$]+/gi, '_')\n\nconst escapeQuotes = (value: string) => value.replace(/['\"]/g, (val) => `\\\\${val}`)\n\nexport interface Sanitizer {\n  makeSafeTypeIdentifier(value: string): string\n  makeSafeMethodIdentifier(value: string): string\n  makeSafeVariableIdentifier(value: string): string\n  makeSafePropertyIdentifier(value: string): string\n  makeSafeStringTypeLiteral(value: string): string\n  getSafeMemberAccessor(value: string): string\n  isSafeVariableIdentifier(value: string): boolean\n}\n\nconst defaultSanitiser: Sanitizer = {\n  makeSafePropertyIdentifier(value: string) {\n    return camelCase(replaceInvalidWithUnderscore(value))\n  },\n  makeSafeTypeIdentifier(value: string) {\n    return pascalCase(replaceInvalidWithUnderscore(value))\n  },\n  makeSafeMethodIdentifier(value: string) {\n    return camelCase(replaceInvalidWithUnderscore(value))\n  },\n  isSafeVariableIdentifier(value: string) {\n    return /^[a-z$_][a-z0-9_$]*$/i.test(value)\n  },\n  makeSafeVariableIdentifier(value: string) {\n    return camelCase(replaceInvalidWithUnderscore(value))\n  },\n  makeSafeStringTypeLiteral(value: string): string {\n    return escapeQuotes(value)\n  },\n  getSafeMemberAccessor(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? `.${value}` : `[${value}]`\n  },\n}\n\nconst preservingSanitiser: Sanitizer = {\n  isSafeVariableIdentifier(value: string): boolean {\n    return /^[a-z$_][a-z0-9_$]*$/i.test(value)\n  },\n  makeSafeMethodIdentifier(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? value : `\"${escapeQuotes(value)}\"`\n  },\n  makeSafePropertyIdentifier(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? value : `\"${escapeQuotes(value)}\"`\n  },\n  makeSafeTypeIdentifier(value: string): string {\n    return replaceInvalidWithUnderscore(value)\n  },\n  makeSafeVariableIdentifier(value: string): string {\n    return replaceInvalidWithUnderscore(value)\n  },\n  makeSafeStringTypeLiteral(value: string): string {\n    return escapeQuotes(value)\n  },\n  getSafeMemberAccessor(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? `.${value}` : `[${value}]`\n  },\n}\n\nexport const getSanitizer = ({ preserveNames }: { preserveNames: boolean }) => (preserveNames ? preservingSanitiser : defaultSanitiser)\n"],"names":[],"mappings":";;AAEA,MAAM,4BAA4B,GAAG,CAAC,KAAa,KAAK,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAA;AAE5F,MAAM,YAAY,GAAG,CAAC,KAAa,KAAK,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,KAAK,CAAK,EAAA,EAAA,GAAG,CAAE,CAAA,CAAC,CAAA;AAYnF,MAAM,gBAAgB,GAAc;AAClC,IAAA,0BAA0B,CAAC,KAAa,EAAA;AACtC,QAAA,OAAO,SAAS,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAA;KACtD;AACD,IAAA,sBAAsB,CAAC,KAAa,EAAA;AAClC,QAAA,OAAO,UAAU,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAA;KACvD;AACD,IAAA,wBAAwB,CAAC,KAAa,EAAA;AACpC,QAAA,OAAO,SAAS,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAA;KACtD;AACD,IAAA,wBAAwB,CAAC,KAAa,EAAA;AACpC,QAAA,OAAO,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KAC3C;AACD,IAAA,0BAA0B,CAAC,KAAa,EAAA;AACtC,QAAA,OAAO,SAAS,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAA;KACtD;AACD,IAAA,yBAAyB,CAAC,KAAa,EAAA;AACrC,QAAA,OAAO,YAAY,CAAC,KAAK,CAAC,CAAA;KAC3B;AACD,IAAA,qBAAqB,CAAC,KAAa,EAAA;AACjC,QAAA,OAAO,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAI,CAAA,EAAA,KAAK,EAAE,GAAG,CAAI,CAAA,EAAA,KAAK,GAAG,CAAA;KACzE;CACF,CAAA;AAED,MAAM,mBAAmB,GAAc;AACrC,IAAA,wBAAwB,CAAC,KAAa,EAAA;AACpC,QAAA,OAAO,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KAC3C;AACD,IAAA,wBAAwB,CAAC,KAAa,EAAA;AACpC,QAAA,OAAO,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,CAAI,CAAA,EAAA,YAAY,CAAC,KAAK,CAAC,GAAG,CAAA;KACjF;AACD,IAAA,0BAA0B,CAAC,KAAa,EAAA;AACtC,QAAA,OAAO,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,CAAI,CAAA,EAAA,YAAY,CAAC,KAAK,CAAC,GAAG,CAAA;KACjF;AACD,IAAA,sBAAsB,CAAC,KAAa,EAAA;AAClC,QAAA,OAAO,4BAA4B,CAAC,KAAK,CAAC,CAAA;KAC3C;AACD,IAAA,0BAA0B,CAAC,KAAa,EAAA;AACtC,QAAA,OAAO,4BAA4B,CAAC,KAAK,CAAC,CAAA;KAC3C;AACD,IAAA,yBAAyB,CAAC,KAAa,EAAA;AACrC,QAAA,OAAO,YAAY,CAAC,KAAK,CAAC,CAAA;KAC3B;AACD,IAAA,qBAAqB,CAAC,KAAa,EAAA;AACjC,QAAA,OAAO,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAI,CAAA,EAAA,KAAK,EAAE,GAAG,CAAI,CAAA,EAAA,KAAK,GAAG,CAAA;KACzE;CACF,CAAA;MAEY,YAAY,GAAG,CAAC,EAAE,aAAa,EAA8B,MAAM,aAAa,GAAG,mBAAmB,GAAG,gBAAgB;;;;"}
+{"version":3,"file":"sanitization.mjs","sources":["../../src/util/sanitization.ts"],"sourcesContent":["import { camelCase, pascalCase } from 'change-case'\n\nconst replaceInvalidWithUnderscore = (value: string) => value.replace(/[^a-z0-9_$]+/gi, '_')\n\nconst escapeQuotes = (value: string) => value.replace(/['\"]/g, (val) => `\\\\${val}`)\n\nconst removeEnclosingQuotes = (value: string) => value.replace(/^\"|\"$/g, '')\n\nexport interface Sanitizer {\n  makeSafeTypeIdentifier(value: string): string\n  makeSafeMethodIdentifier(value: string): string\n  makeSafeVariableIdentifier(value: string): string\n  makeSafePropertyIdentifier(value: string): string\n  makeSafeStringTypeLiteral(value: string): string\n  getSafeMemberAccessor(value: string): string\n  isSafeVariableIdentifier(value: string): boolean\n}\n\nconst defaultSanitiser: Sanitizer = {\n  makeSafePropertyIdentifier(value: string) {\n    const options = value.startsWith('_') ? { prefixCharacters: '_' } : {}\n    return camelCase(replaceInvalidWithUnderscore(value), options)\n  },\n  makeSafeTypeIdentifier(value: string) {\n    const options = value.startsWith('_') ? { prefixCharacters: '_' } : {}\n    return pascalCase(replaceInvalidWithUnderscore(value), options)\n  },\n  makeSafeMethodIdentifier(value: string) {\n    const options = value.startsWith('_') ? { prefixCharacters: '_' } : {}\n    return camelCase(replaceInvalidWithUnderscore(value), options)\n  },\n  isSafeVariableIdentifier(value: string) {\n    return /^[a-z$_][a-z0-9_$]*$/i.test(value)\n  },\n  makeSafeVariableIdentifier(value: string) {\n    const options = value.startsWith('_') ? { prefixCharacters: '_' } : {}\n    return camelCase(replaceInvalidWithUnderscore(value), options)\n  },\n  makeSafeStringTypeLiteral(value: string): string {\n    return escapeQuotes(value)\n  },\n  getSafeMemberAccessor(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? `.${value}` : `['${this.makeSafeStringTypeLiteral(value)}']`\n  },\n}\n\nconst preservingSanitiser: Sanitizer = {\n  isSafeVariableIdentifier(value: string): boolean {\n    return /^[a-z$_][a-z0-9_$]*$/i.test(value)\n  },\n  makeSafeMethodIdentifier(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? value : `\"${this.makeSafeStringTypeLiteral(value)}\"`\n  },\n  makeSafePropertyIdentifier(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? value : `\"${this.makeSafeStringTypeLiteral(value)}\"`\n  },\n  makeSafeTypeIdentifier(value: string): string {\n    return replaceInvalidWithUnderscore(value)\n  },\n  makeSafeVariableIdentifier(value: string): string {\n    return replaceInvalidWithUnderscore(value)\n  },\n  makeSafeStringTypeLiteral(value: string): string {\n    return escapeQuotes(value)\n  },\n  getSafeMemberAccessor(value: string): string {\n    return this.isSafeVariableIdentifier(value) ? `.${value}` : `['${removeEnclosingQuotes(value)}']`\n  },\n}\n\nexport const getSanitizer = ({ preserveNames }: { preserveNames: boolean }) => (preserveNames ? preservingSanitiser : defaultSanitiser)\n"],"names":[],"mappings":"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"}