@skmtc/core 0.0.639 → 0.0.640

package/esm/context/RenderContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RenderContext.d.ts","sourceRoot":"","sources":["../../src/context/RenderContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAqB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAI7D,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,cAAc,CAAC,EAAE,kBAAkB,CAAA;IACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACnD,CAAA;AA4BD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAE7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;gBACtC,EACV,KAAK,EACL,QAAQ,EACR,aAAa,EACb,cAAc,EACd,QAAQ,EACR,MAAM,EACN,UAAU,EACV,oBAAoB,EACrB,EAAE,eAAe;IAWlB,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;IAiBvC,OAAO,CAAC,OAAO;IAyCf,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAIlD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAU/B,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}
+{"version":3,"file":"RenderContext.d.ts","sourceRoot":"","sources":["../../src/context/RenderContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAqB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAG7D,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,cAAc,CAAC,EAAE,kBAAkB,CAAA;IACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACnD,CAAA;AA4BD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAE7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;gBACtC,EACV,KAAK,EACL,QAAQ,EACR,aAAa,EACb,cAAc,EACd,QAAQ,EACR,MAAM,EACN,UAAU,EACV,oBAAoB,EACrB,EAAE,eAAe;IAWlB,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;IAiBvC,OAAO,CAAC,OAAO;IAyCf,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAIlD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAU/B,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}

package/esm/context/RenderContext.js

@@ -15,16 +15,18 @@ import invariant from 'tiny-invariant';
 import { normalize } from '../deps/jsr.io/@std/path/1.0.6/mod.js';
 import { toResolvedArtifactPath } from '../helpers/toResolvedArtifactPath.js';
 import { tracer } from '../helpers/tracer.js';
-import { format, estree, typescript } from '../helpers/prettier.js';
-import makeSynchronized from 'make-synchronized';
-const formatSync = makeSynchronized(import.meta, ({ content, prettierConfig, path }) => {
-    return format(content, {
-        ...prettierConfig,
-        parser: 'estree',
-        plugins: [estree, typescript],
-        filepath: path
-    });
-});
+import synchronizedPrettier from '@prettier/sync';
+// const formatSync = makeSynchronized(
+//   import.meta,
+//   ({ content, prettierConfig, path }: FormatSyncArgs) => {
+//     return format(content, {
+//       ...prettierConfig,
+//       parser: 'estree',
+//       plugins: [estree, typescript],
+//       filepath: path
+//     })
+//   }
+// )
 export class RenderContext {
     constructor({ files, previews, schemaOptions, prettierConfig, basePath, logger, stackTrail, captureCurrentResult }) {
         Object.defineProperty(this, "files", {
@@ -137,7 +139,9 @@ export class RenderContext {
 _RenderContext_prettierConfig = new WeakMap(), _RenderContext_stackTrail = new WeakMap();
 const renderFile = ({ content, destinationPath, basePath, prettierConfig }) => {
     const path = toResolvedArtifactPath({ basePath, destinationPath });
-    const formatted = prettierConfig ? formatSync({ prettierConfig, content, path }) : content;
+    const formatted = prettierConfig
+        ? synchronizedPrettier.format(content, { ...prettierConfig, parser: 'espree' })
+        : content;
     return {
         content: formatted,
         path,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skmtc/core",
-  "version": "0.0.639",
+  "version": "0.0.640",
   "main": "./script/mod.js",
   "module": "./esm/mod.js",
   "exports": {
@@ -133,14 +133,13 @@
     "@apiture/openapi-down-convert": "0.14.0",
     "@babel/helper-validator-identifier": "7.22.20",
     "@deno/shim-deno": "~0.18.0",
+    "@prettier/sync": "^0.5.5",
     "@sentry/deno": "8.47.0",
     "@types/babel__helper-validator-identifier": "7.15.2",
     "@types/lodash-es": "4.17.12",
     "@types/swagger2openapi": "7.0.4",
     "lodash-es": "4.17.21",
-    "make-synchronized": "^0.7.2",
     "openapi-types": "12.1.3",
-    "prettier": "^3.5.3",
     "swagger2openapi": "7.0.8",
     "tiny-invariant": "1.3.3",
     "ts-pattern": "5.6.0"

package/script/context/RenderContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RenderContext.d.ts","sourceRoot":"","sources":["../../src/context/RenderContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAqB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAI7D,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,cAAc,CAAC,EAAE,kBAAkB,CAAA;IACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACnD,CAAA;AA4BD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAE7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;gBACtC,EACV,KAAK,EACL,QAAQ,EACR,aAAa,EACb,cAAc,EACd,QAAQ,EACR,MAAM,EACN,UAAU,EACV,oBAAoB,EACrB,EAAE,eAAe;IAWlB,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;IAiBvC,OAAO,CAAC,OAAO;IAyCf,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAIlD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAU/B,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}
+{"version":3,"file":"RenderContext.d.ts","sourceRoot":"","sources":["../../src/context/RenderContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAqB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAG7D,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,cAAc,CAAC,EAAE,kBAAkB,CAAA;IACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACnD,CAAA;AA4BD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAE7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;gBACtC,EACV,KAAK,EACL,QAAQ,EACR,aAAa,EACb,cAAc,EACd,QAAQ,EACR,MAAM,EACN,UAAU,EACV,oBAAoB,EACrB,EAAE,eAAe;IAWlB,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;IAiBvC,OAAO,CAAC,OAAO;IAyCf,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAIlD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAU/B,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}

package/script/context/RenderContext.js

@@ -44,16 +44,18 @@ const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
 const mod_js_1 = require("../deps/jsr.io/@std/path/1.0.6/mod.js");
 const toResolvedArtifactPath_js_1 = require("../helpers/toResolvedArtifactPath.js");
 const tracer_js_1 = require("../helpers/tracer.js");
-const prettier_js_1 = require("../helpers/prettier.js");
-const make_synchronized_1 = __importDefault(require("make-synchronized"));
-const formatSync = (0, make_synchronized_1.default)(import.meta, ({ content, prettierConfig, path }) => {
-    return (0, prettier_js_1.format)(content, {
-        ...prettierConfig,
-        parser: 'estree',
-        plugins: [prettier_js_1.estree, prettier_js_1.typescript],
-        filepath: path
-    });
-});
+const sync_1 = __importDefault(require("@prettier/sync"));
+// const formatSync = makeSynchronized(
+//   import.meta,
+//   ({ content, prettierConfig, path }: FormatSyncArgs) => {
+//     return format(content, {
+//       ...prettierConfig,
+//       parser: 'estree',
+//       plugins: [estree, typescript],
+//       filepath: path
+//     })
+//   }
+// )
 class RenderContext {
     constructor({ files, previews, schemaOptions, prettierConfig, basePath, logger, stackTrail, captureCurrentResult }) {
         Object.defineProperty(this, "files", {
@@ -167,7 +169,9 @@ exports.RenderContext = RenderContext;
 _RenderContext_prettierConfig = new WeakMap(), _RenderContext_stackTrail = new WeakMap();
 const renderFile = ({ content, destinationPath, basePath, prettierConfig }) => {
     const path = (0, toResolvedArtifactPath_js_1.toResolvedArtifactPath)({ basePath, destinationPath });
-    const formatted = prettierConfig ? formatSync({ prettierConfig, content, path }) : content;
+    const formatted = prettierConfig
+        ? sync_1.default.format(content, { ...prettierConfig, parser: 'espree' })
+        : content;
     return {
         content: formatted,
         path,

package/esm/helpers/prettier.d.ts

@@ -1,7 +0,0 @@
-import * as prettier from 'prettier';
-import estreeImport from 'prettier/plugins/estree';
-import typesciptImport from 'prettier/plugins/typescript';
-export declare const format: typeof prettier.format;
-export declare const estree: typeof estreeImport;
-export declare const typescript: typeof typesciptImport;
-//# sourceMappingURL=prettier.d.ts.map

package/esm/helpers/prettier.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"prettier.d.ts","sourceRoot":"","sources":["../../src/helpers/prettier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AACpC,OAAO,YAAY,MAAM,yBAAyB,CAAA;AAClD,OAAO,eAAe,MAAM,6BAA6B,CAAA;AAEzD,eAAO,MAAM,MAAM,wBAAkB,CAAA;AACrC,eAAO,MAAM,MAAM,qBAAe,CAAA;AAClC,eAAO,MAAM,UAAU,wBAAkB,CAAA"}

package/esm/helpers/prettier.js

@@ -1,6 +0,0 @@
-import * as prettier from 'prettier';
-import estreeImport from 'prettier/plugins/estree';
-import typesciptImport from 'prettier/plugins/typescript';
-export const format = prettier.format;
-export const estree = estreeImport;
-export const typescript = typesciptImport;

package/script/helpers/prettier.d.ts

@@ -1,7 +0,0 @@
-import * as prettier from 'prettier';
-import estreeImport from 'prettier/plugins/estree';
-import typesciptImport from 'prettier/plugins/typescript';
-export declare const format: typeof prettier.format;
-export declare const estree: typeof estreeImport;
-export declare const typescript: typeof typesciptImport;
-//# sourceMappingURL=prettier.d.ts.map

package/script/helpers/prettier.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"prettier.d.ts","sourceRoot":"","sources":["../../src/helpers/prettier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AACpC,OAAO,YAAY,MAAM,yBAAyB,CAAA;AAClD,OAAO,eAAe,MAAM,6BAA6B,CAAA;AAEzD,eAAO,MAAM,MAAM,wBAAkB,CAAA;AACrC,eAAO,MAAM,MAAM,qBAAe,CAAA;AAClC,eAAO,MAAM,UAAU,wBAAkB,CAAA"}

package/script/helpers/prettier.js

@@ -1,35 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.typescript = exports.estree = exports.format = void 0;
-const prettier = __importStar(require("prettier"));
-const estree_1 = __importDefault(require("prettier/plugins/estree"));
-const typescript_1 = __importDefault(require("prettier/plugins/typescript"));
-exports.format = prettier.format;
-exports.estree = estree_1.default;
-exports.typescript = typescript_1.default;