diff --git a/.github/workflows/jsr-publish.yml b/.github/workflows/jsr-publish.yml deleted file mode 100644 index ad5781d..0000000 --- a/.github/workflows/jsr-publish.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Publish -on: - push: - branches: - - main - -jobs: - publish: - runs-on: ubuntu-latest - - permissions: - contents: read - id-token: write - - steps: - - uses: actions/checkout@v4 - - - name: Publish package - run: npx jsr publish diff --git a/.gitignore b/.gitignore index 4ef133f..cf203ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ -/node_modules/ -package-lock.json +target/* +!target/cjs/ +!target/esm/ +!target/dts/ +jsr.json +node_modules/ +buildstamp.json diff --git a/jsr.json b/jsr.json deleted file mode 100644 index 8bbd945..0000000 --- a/jsr.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "@webpod/zurk", - "version": "0.9.0", - "license": "MIT", - "exports": "./mod.ts" -} diff --git a/package-lock.json b/package-lock.json index 95f42f7..89ca96a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "jsr": "^0.13.2", "minimist": "^1.2.8", "ts-node": "^10.9.2", + "tslib": "^2.8.1", "typedoc": "^0.27.2", "typescript": "^5.7.2" } @@ -8176,10 +8177,11 @@ } }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD" }, "node_modules/type-check": { "version": "0.4.0", diff --git a/package.json b/package.json index 138278c..87f776f 100644 --- a/package.json +++ b/package.json @@ -87,6 +87,7 @@ "jsr": "^0.13.2", "minimist": "^1.2.8", "ts-node": "^10.9.2", + "tslib": "^2.8.1", "typedoc": "^0.27.2", "typescript": "^5.7.2" } diff --git a/src/main/ts/util.ts b/src/main/ts/util.ts index 77efc97..1c698e5 100644 --- a/src/main/ts/util.ts +++ b/src/main/ts/util.ts @@ -38,7 +38,7 @@ export const isStringLiteral = ( ): pieces is TemplateStringsArray => pieces?.length > 0 && pieces.raw?.length === pieces.length && - Object.isFrozen(pieces) && + // Object.isFrozen(pieces) && rest.length + 1 === pieces.length export const assign = (target: T, ...extras: E[]): T => diff --git a/src/test/ts/util.test.ts b/src/test/ts/util.test.ts index 94df44d..177e7a1 100644 --- a/src/test/ts/util.test.ts +++ b/src/test/ts/util.test.ts @@ -1,6 +1,7 @@ import * as assert from 'node:assert' import {describe, it, test} from 'node:test' import { assign, isStringLiteral } from '../../main/ts/util.js' +import tslib from 'tslib' describe('util', () => { it('assign()', () => { @@ -13,6 +14,7 @@ describe('util', () => { assert.ok(isStringLiteral``) assert.ok(isStringLiteral`foo`) assert.ok(isStringLiteral`foo ${bar}`) + assert.ok(isStringLiteral(tslib.__makeTemplateObject(["git pull --tags --force ", " ", ""], ["git pull --tags --force ", " ", ""]), 'foo', 'bar')) assert.ok(!isStringLiteral('')) assert.ok(!isStringLiteral('foo')) diff --git a/target/cjs/util.cjs b/target/cjs/util.cjs index 487ca61..34490dc 100644 --- a/target/cjs/util.cjs +++ b/target/cjs/util.cjs @@ -50,7 +50,8 @@ var makeDeferred = () => { var isPromiseLike = (value) => typeof (value == null ? void 0 : value.then) === "function"; var isStringLiteral = (pieces, ...rest) => { var _a; - return (pieces == null ? void 0 : pieces.length) > 0 && ((_a = pieces.raw) == null ? void 0 : _a.length) === pieces.length && Object.isFrozen(pieces) && rest.length + 1 === pieces.length; + return (pieces == null ? void 0 : pieces.length) > 0 && ((_a = pieces.raw) == null ? void 0 : _a.length) === pieces.length && // Object.isFrozen(pieces) && + rest.length + 1 === pieces.length; }; var assign = (target, ...extras) => Object.defineProperties(target, extras.reduce((m, extra) => __spreadValues(__spreadValues({}, m), Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(extra)).filter(([, v]) => !Object.prototype.hasOwnProperty.call(v, "value") || v.value !== void 0))), {})); var quote = (arg) => { diff --git a/target/esm/util.mjs b/target/esm/util.mjs index d3c1ab6..d991a4d 100644 --- a/target/esm/util.mjs +++ b/target/esm/util.mjs @@ -22,7 +22,8 @@ var makeDeferred = () => { var isPromiseLike = (value) => typeof (value == null ? void 0 : value.then) === "function"; var isStringLiteral = (pieces, ...rest) => { var _a; - return (pieces == null ? void 0 : pieces.length) > 0 && ((_a = pieces.raw) == null ? void 0 : _a.length) === pieces.length && Object.isFrozen(pieces) && rest.length + 1 === pieces.length; + return (pieces == null ? void 0 : pieces.length) > 0 && ((_a = pieces.raw) == null ? void 0 : _a.length) === pieces.length && // Object.isFrozen(pieces) && + rest.length + 1 === pieces.length; }; var assign = (target, ...extras) => Object.defineProperties(target, extras.reduce((m, extra) => ({ ...m, ...Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(extra)).filter(([, v]) => !Object.prototype.hasOwnProperty.call(v, "value") || v.value !== void 0)) }), {})); var quote = (arg) => {