Rc

.github/workflows/publish-npm.yml

@@ -6,7 +6,7 @@ on:
       - main
       - rc
       - beta
-      - dev
+      - next 
   workflow_dispatch:
 
 jobs:
@@ -25,14 +25,32 @@ jobs:
           node-version: '24'
           registry-url: 'https://registry.npmjs.org'
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: latest
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Cache pnpm store
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install
 
       - name: Run tests
-        run: npm test
+        run: pnpm test
 
       - name: Build project
-        run: npm run build:prod
+        run: pnpm build:prod
 
       - name: Determine version and tag
         id: version
@@ -45,8 +63,15 @@ jobs:
             "main")
               NPM_TAG="latest"
               VERSION=$PACKAGE_VERSION
+
+              # Find the latest tag matching this package and error if it already exists
+              LAST_TAG=$(git tag --list "v${PACKAGE_VERSION}" | sort -V | tail -n1)
+              if [ "$LAST_TAG" == "v${PACKAGE_VERSION}" ]; then
+                echo "Version $PACKAGE_VERSION already exists. Please update the version in package.json and jsr.json before publishing."
+                exit 1
+              fi
               ;;
-            "rc"|"beta"|"dev")
+            "rc"|"beta"|"next")
               IDENTIFIER=$BRANCH_NAME
               NPM_TAG=$BRANCH_NAME
 
@@ -77,21 +102,44 @@ jobs:
 
       - name: Update package version
         run: |
-          npm version ${{ steps.version.outputs.version }} --no-git-tag-version --allow-same-version
+          pnpm version ${{ steps.version.outputs.version }} --no-git-tag-version --allow-same-version
+          ./scripts/update-jsr-version.sh ${{ steps.version.outputs.version }}
+
+      - name: Create distribution archive
+        run: |
+          # Create a compressed archive of the dist directory
+          tar -czf dist-${{ steps.version.outputs.version }}.tar.gz dist/
+
+          # Create a zip archive as well for Windows users
+          zip -r dist-${{ steps.version.outputs.version }}.zip dist/
+
+          # Create a compressed archive of the dist-qjs directory
+          tar -czf dist-qjs-${{ steps.version.outputs.version }}.tar.gz dist-qjs/
+
+          # Create a zip archive of the dist-qjs directory for Windows users
+          zip -r dist-qjs-${{ steps.version.outputs.version }}.zip dist-qjs
 
       - name: Publish to NPM
         run: |
-          npm publish --tag ${{ steps.version.outputs.npm_tag }}
+          pnpm publish --tag ${{ steps.version.outputs.npm_tag }} --no-git-checks
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
+      - name: Publish to JSR
+        run: pnpx jsr publish --allow-dirty
+
       - name: Create GitHub Release (main branch only)
         if: github.ref == 'refs/heads/main'
         uses: ncipollo/release-action@v1
         with:
           tag: v${{ steps.version.outputs.version }}
           name: Release v${{ steps.version.outputs.version }}
           commit: ${{ github.sha }}
+          artifacts: |
+            dist-${{ steps.version.outputs.version }}.tar.gz
+            dist-${{ steps.version.outputs.version }}.zip
+            dist-qjs-${{ steps.version.outputs.version }}.tar.gz
+            dist-qjs-${{ steps.version.outputs.version }}.zip
           body: |
             ## Changes
 
@@ -102,18 +150,27 @@ jobs:
             npm install sqm@latest
             ```
 
+            Download the distribution archives:
+            - dist-${{ steps.version.outputs.version }}.tar.gz `compressed tar.gz archive`
+            - dist-${{ steps.version.outputs.version }}.zip `zip archive`
+
             For full changelog, see the commit history.
           draft: false
           prerelease: false
           generateReleaseNotes: true
 
-      - name: Create Pre-release (rc, beta, dev branches)
+      - name: Create Pre-release (rc, beta, next branches)
         if: github.ref != 'refs/heads/main'
         uses: ncipollo/release-action@v1
         with:
           tag: v${{ steps.version.outputs.version }}
           name: ${{ steps.version.outputs.branch }} v${{ steps.version.outputs.version }}
           commit: ${{ github.sha }}
+          artifacts: |
+            dist-${{ steps.version.outputs.version }}.tar.gz
+            dist-${{ steps.version.outputs.version }}.zip
+            dist-qjs-${{ steps.version.outputs.version }}.tar.gz
+            dist-qjs-${{ steps.version.outputs.version }}.zip
           body: |
             ## ${{ steps.version.outputs.branch }} Release
 
@@ -124,6 +181,10 @@ jobs:
             npm install sqm@${{ steps.version.outputs.npm_tag }}
             ```
 
+            Download the distribution archives:
+            - dist-${{ steps.version.outputs.version }}.tar.gz `compressed tar.gz archive`
+            - dist-${{ steps.version.outputs.version }}.zip `zip archive`
+
             **⚠️ Warning**: This is a pre-release version and may contain bugs or incomplete features.
           draft: false
           prerelease: true

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 dist
+dist*
 coverage

.npmignore

@@ -6,4 +6,5 @@ package-lock.json
 .vscode
 .idea
 .DS_Store
+scripts
 UPDATE-STRATEGY.md

UPDATE-STRATEGY.md

@@ -4,34 +4,34 @@ Fisrt I'll clarify branch names:
 - `main` is the production branch, it should always be stable and deployable.
 - `rc` is the release candidate branch, it is used for testing new features before they are merged into `main`.
 - `beta` is the beta branch, it is used for testing new features before they are merged into `rc`.
-- `dev` is the development branch, it is used for active development and may be unstable
+- `next` is the development branch, it is used for active development and may be unstable
 
 ## Update Strategy
 1. **Development Phase**:
-   - All new features and bug fixes are developed in the `dev` branch.
-   - Regular commits and pushes to `dev` to ensure changes are tracked.
+   - All new features and bug fixes are developed in the `next` branch.
+   - Regular commits and pushes to `next` to ensure changes are tracked.
    - Once a feature or fix is complete, it is merged into the `beta` branch for initial testing.
 2. **Beta Testing Phase**:
    - The `beta` branch is published into npm with the `beta` tag.
    - Beta testers and early adopters can install the beta version using `npm install sqm@beta`.
-   - Feedback from beta testers is collected and any issues are addressed in the `dev` branch.
+   - Feedback from beta testers is collected and any issues are addressed in the `next` branch.
    - Once the beta version is stable and all critical issues are resolved, it is merged into the `rc` branch.
 3. **Release Candidate Phase**:
    - The `rc` branch is published into npm with the `rc` tag.
    - Further testing is conducted to ensure stability and performance.
-   - Any final bugs or issues are fixed in the `dev` branch and merged into `rc`.
+   - Any final bugs or issues are fixed in the `next` branch and merged into `rc`.
    - Once the release candidate is deemed stable, it is merged into the `main` branch.
 4. **Production Release Phase**:
    - The `main` branch is published into npm with the `latest` tag.
    - Users can install the stable version using `npm install sqm`.
    - Post-release monitoring is conducted to ensure the release is functioning as expected.
-   - Any critical issues found in production are addressed in the `dev` branch and the cycle repeats.
+   - Any critical issues found in production are addressed in the `next` branch and the cycle repeats.
 
 ## Hotfixes
 In case of critical bugs in the `main` branch:
 1. Create a hotfix branch from `main`.
 2. Implement the fix and test it thoroughly.
-3. Merge the hotfix branch back into `main`, `rc`, and `dev` branches.
+3. Merge the hotfix branch back into `main`, `rc`, and `next` branches.
 4. Publish the updated `main` branch and other branches as necessary.
 5. Communicate the hotfix to users if necessary.
 

biome.json

@@ -0,0 +1,49 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.2.5/schema.json",
+  "vcs": {
+    "enabled": true,
+    "clientKind": "git",
+    "useIgnoreFile": true
+  },
+  "files": {
+    "ignoreUnknown": false,
+    "includes": ["**/*.ts", "!**/*.test.ts", "!**/*.spec.ts"]
+  },
+  "formatter": {
+    "enabled": true,
+    "indentStyle": "space",
+    "indentWidth": 2
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true,
+      "suspicious": {
+        "noExplicitAny": "off",
+        "useIterableCallbackReturn": "off",
+        "noConfusingVoidType": "off"
+      },
+      "style": {
+        "noNonNullAssertion": "off"
+      },
+      "complexity": {
+        "noBannedTypes": "off",
+        "noStaticOnlyClass": "off",
+        "useLiteralKeys": "off"
+      }
+    }
+  },
+  "javascript": {
+    "formatter": {
+      "quoteStyle": "double"
+    }
+  },
+  "assist": {
+    "enabled": true,
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    }
+  }
+}

jsr.json

@@ -0,0 +1,36 @@
+{
+  "name": "@fragmenta/sqm",
+  "version": "0.7.0",
+  "description": "A lightweight and flexible query maker library for building raw SQL queries in JavaScript.",
+  "license": "Apache-2.0",
+  "exports": {
+    ".": "./src/index.ts",
+    "./queryUtils": "./src/queryUtils/index.ts",
+    "./types": "./src/types/index.ts",
+    "./ddl": "./src/queryKinds/ddl/index.ts",
+    "./dml": "./src/queryKinds/dml/index.ts",
+    "./ddl/table": "./src/queryKinds/ddl/table/index.ts"
+  },
+  "publish": {
+    "include": [
+      "src",
+      "README.md",
+      "LICENSE.md"
+    ],
+    "exclude": [
+      "node_modules",
+      "dist",
+      "dist-qjs",
+      "**/*.test.ts",
+      "**/*.spec.ts",
+      "scripts",
+      "tsup.config.ts",
+      "tsup.config.qjs.ts",
+      "vitest.config.ts",
+      ".gitignore",
+      ".npmignore",
+      "package-lock.json",
+      "pnpm-lock.yaml"
+    ]
+  }
+}