Merge pull request #4 from duckdb/jray/publish-to-duckdb-node-neo

publish to duckdb node neo
duckdb · Aug 10, 2024 · 0b1d932 · 0b1d932
2 parents d775f4d + d6933df
commit 0b1d932
Show file tree

Hide file tree

Showing 41 changed files with 150 additions and 55 deletions.
diff --git a/.github/workflows/NodeJS.yml b/.github/workflows/NodeJS.yml
@@ -3,6 +3,52 @@ on:
   push:
   pull_request:
   workflow_dispatch:
+    inputs:
+      publish_dry_run:
+        description: 'Publish Dry Run'
+        type: boolean
+        required: true
+        default: true
+      linux:
+        description: 'Run on Linux'
+        type: boolean
+        required: true
+        default: false
+      publish_linux_x64:
+        description: 'Publish Bindings for Linux x64'
+        type: boolean
+        required: true
+        default: false
+      publish_bindings:
+        description: 'Publish Bindings (from Linux)'
+        type: boolean
+        required: true
+        default: false
+      publish_api:
+        description: 'Publish API (from Linux)'
+        type: boolean
+        required: true
+        default: false
+      macos:
+        description: 'Run on Mac OS'
+        type: boolean
+        required: true
+        default: false
+      publish_darwin_arm64:
+        description: 'Publish Bindings for Darwin ARM64'
+        type: boolean
+        required: true
+        default: false
+      windows:
+        description: 'Run on Windows'
+        type: boolean
+        required: true
+        default: false
+      publish_win32_x64:
+        description: 'Publish Bindings for Win32 x64'
+        type: boolean
+        required: true
+        default: false
   repository_dispatch:
 
 concurrency:
@@ -11,9 +57,10 @@ concurrency:
 
 jobs:
 
-  linux-nodejs:
+  linux:
     name: Linux
     runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.linux }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -42,10 +89,32 @@ jobs:
       - name: API - Test
         working-directory: alt/api
         run: pnpm test
+
+      - name: Publish - Bindings - Linux x64
+        if: ${{ inputs.publish_linux_x64 }}
+        working-directory: alt/bindings/pkgs/@duckdb/node-bindings-linux-x64
+        run: pnpm publish ${{ inputs.publish_dry_run && '--dry-run' || '' }} --publish-branch ${{ github.ref_name }} --access public
+        env:
+          NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish - Bindings
+        if: ${{ inputs.publish_bindings }}
+        working-directory: alt/bindings/pkgs/@duckdb/node-bindings
+        run: pnpm publish ${{ inputs.publish_dry_run && '--dry-run' || '' }} --publish-branch ${{ github.ref_name }} --access public
+        env:
+          NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish - API
+        if: ${{ inputs.publish_api }}
+        working-directory: alt/api/pkgs/@duckdb/node-api
+        run: pnpm publish ${{ inputs.publish_dry_run && '--dry-run' || '' }} --publish-branch ${{ github.ref_name }} --access public
+        env:
+          NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  osx-nodejs:
+  macos:
     name: Mac OS X
     runs-on: macos-latest
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.macos }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -74,10 +143,18 @@ jobs:
       - name: API - Test
         working-directory: alt/api
         run: pnpm test
+
+      - name: Publish - Bindings - Darwin ARM64
+        if: ${{ inputs.publish_darwin_arm64 }}
+        working-directory: alt/bindings/pkgs/@duckdb/node-bindings-darwin-arm64
+        run: pnpm publish ${{ inputs.publish_dry_run && '--dry-run' || '' }} --publish-branch ${{ github.ref_name }} --access public
+        env:
+          NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  win-nodejs:
+  windows:
     name: Windows
     runs-on: windows-latest
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.windows }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -106,3 +183,10 @@ jobs:
       - name: API - Test
         working-directory: alt/api
         run: pnpm test
+
+      - name: Publish - Bindings - Win32 x64
+        if: ${{ inputs.publish_win32_x64 }}
+        working-directory: alt/bindings/pkgs/@duckdb/node-bindings-win32-x64
+        run: pnpm publish ${{ inputs.publish_dry_run && '--dry-run' || '' }} --publish-branch ${{ github.ref_name }} --access public
+        env:
+          NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/alt/README.md b/alt/README.md
@@ -0,0 +1 @@
+# DuckDB Node Bindings & API
diff --git a/alt/api/package.json b/alt/api/package.json
@@ -9,7 +9,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jraymakers/duckdb-node-bindings": "workspace:*"
+    "@duckdb/node-bindings": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^20.14.12",

diff --git a/alt/api/pkgs/@duckdb/node-api/.npmrc b/alt/api/pkgs/@duckdb/node-api/.npmrc
@@ -1 +1,2 @@
-@jraymakers:registry=https://npm.pkg.github.com
+@duckdb:registry=https://npm.pkg.github.com
+//npm.pkg.github.com/:_authToken=${NPM_AUTH_TOKEN}
diff --git a/alt/api/pkgs/@duckdb/node-api/README.md b/alt/api/pkgs/@duckdb/node-api/README.md
@@ -0,0 +1 @@
+# DuckDB Node API
diff --git a/alt/api/pkgs/@duckdb/node-api/package.json b/alt/api/pkgs/@duckdb/node-api/package.json
@@ -1,13 +1,13 @@
 {
-  "name": "@jraymakers/duckdb-node-api",
+  "name": "@duckdb/node-api",
   "version": "0.0.2",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@jraymakers/duckdb-node-bindings": "workspace:*"
+    "@duckdb/node-bindings": "workspace:*"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/jraymakers/duckdb-node-packages.git"
+    "url": "https://github.com/duckdb/duckdb-node-neo.git"
   }
 }
diff --git a/alt/api/src/DuckDBAppender.ts b/alt/api/src/DuckDBAppender.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 
 export class DuckDBAppender {
   private readonly appender: duckdb.Appender;

diff --git a/alt/api/src/DuckDBConnection.ts b/alt/api/src/DuckDBConnection.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { DuckDBAppender } from './DuckDBAppender';
 import { DuckDBExtractedStatements } from './DuckDBExtractedStatements';
 import { DuckDBInstance } from './DuckDBInstance';

diff --git a/alt/api/src/DuckDBDataChunk.ts b/alt/api/src/DuckDBDataChunk.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { DuckDBVector } from './DuckDBVector';
 
 export class DuckDBDataChunk {

diff --git a/alt/api/src/DuckDBExtractedStatements.ts b/alt/api/src/DuckDBExtractedStatements.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { DuckDBPreparedStatement } from './DuckDBPreparedStatement';
 
 export class DuckDBExtractedStatements {

diff --git a/alt/api/src/DuckDBInstance.ts b/alt/api/src/DuckDBInstance.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { DuckDBConnection } from './DuckDBConnection';
 
 export class DuckDBInstance {

diff --git a/alt/api/src/DuckDBLogicalType.ts b/alt/api/src/DuckDBLogicalType.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import {
   DuckDBArrayType,
   DuckDBBigIntType,

diff --git a/alt/api/src/DuckDBPendingResult.ts b/alt/api/src/DuckDBPendingResult.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { DuckDBResult } from './DuckDBResult';
 
 // Values match similar enum in C API.

diff --git a/alt/api/src/DuckDBPreparedStatement.ts b/alt/api/src/DuckDBPreparedStatement.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { DuckDBPendingResult } from './DuckDBPendingResult';
 import { DuckDBResult } from './DuckDBResult';
 import { DuckDBTypeId } from './DuckDBTypeId';

diff --git a/alt/api/src/DuckDBResult.ts b/alt/api/src/DuckDBResult.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { DuckDBDataChunk } from './DuckDBDataChunk';
 import { DuckDBLogicalType } from './DuckDBLogicalType';
 import { DuckDBType } from './DuckDBType';

diff --git a/alt/api/src/DuckDBVector.ts b/alt/api/src/DuckDBVector.ts
@@ -1,5 +1,5 @@
 import os from 'os';
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { DuckDBLogicalType } from './DuckDBLogicalType';
 import {
   DuckDBArrayType,

diff --git a/alt/api/src/configurationOptionDescriptions.ts b/alt/api/src/configurationOptionDescriptions.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 
 export function configurationOptionDescriptions(): Readonly<
   Record<string, string>

diff --git a/alt/api/src/throwOnFailure.ts b/alt/api/src/throwOnFailure.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 
 export function throwOnFailure(state: duckdb.State, message: string, getError?: () => string, dispose?: () => void) {
   if (state !== duckdb.State.Success) {

diff --git a/alt/api/src/version.ts b/alt/api/src/version.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 
 export function version(): string {
   return duckdb.library_version();

diff --git a/alt/bindings/package.json b/alt/bindings/package.json
@@ -12,7 +12,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jraymakers/duckdb-node-bindings": "workspace:*",
+    "@duckdb/node-bindings": "workspace:*",
     "node-addon-api": "^8.0.0",
     "node-gyp": "^10.1.0",
     "rimraf": "^5.0.7",

diff --git a/alt/bindings/pkgs/@duckdb/node-bindings-darwin-arm64/.npmrc b/alt/bindings/pkgs/@duckdb/node-bindings-darwin-arm64/.npmrc
@@ -1 +1,2 @@
-@jraymakers:registry=https://npm.pkg.github.com
+@duckdb:registry=https://npm.pkg.github.com
+//npm.pkg.github.com/:_authToken=${NPM_AUTH_TOKEN}
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings-darwin-arm64/README.md b/alt/bindings/pkgs/@duckdb/node-bindings-darwin-arm64/README.md
@@ -0,0 +1 @@
+# DuckDB Node Bindings: Darwin ARM64
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings-darwin-arm64/package.json b/alt/bindings/pkgs/@duckdb/node-bindings-darwin-arm64/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@jraymakers/duckdb-node-bindings-darwin-arm64",
-  "version": "0.0.1",
+  "name": "@duckdb/node-bindings-darwin-arm64",
+  "version": "0.0.2",
   "os": [
     "darwin"
   ],
@@ -9,6 +9,6 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/jraymakers/duckdb-node-packages.git"
+    "url": "https://github.com/duckdb/duckdb-node-neo.git"
   }
 }
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings-linux-x64/.npmrc b/alt/bindings/pkgs/@duckdb/node-bindings-linux-x64/.npmrc
@@ -1 +1,2 @@
-@jraymakers:registry=https://npm.pkg.github.com
+@duckdb:registry=https://npm.pkg.github.com
+//npm.pkg.github.com/:_authToken=${NPM_AUTH_TOKEN}
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings-linux-x64/README.md b/alt/bindings/pkgs/@duckdb/node-bindings-linux-x64/README.md
@@ -0,0 +1 @@
+# DuckDB Node Bindings: Linux x64
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings-linux-x64/package.json b/alt/bindings/pkgs/@duckdb/node-bindings-linux-x64/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@jraymakers/duckdb-node-bindings-linux-x64",
-  "version": "0.0.1",
+  "name": "@duckdb/node-bindings-linux-x64",
+  "version": "0.0.2",
   "os": [
     "linux"
   ],
@@ -9,6 +9,6 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/jraymakers/duckdb-node-packages.git"
+    "url": "https://github.com/duckdb/duckdb-node-neo.git"
   }
 }
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings-win32-x64/.npmrc b/alt/bindings/pkgs/@duckdb/node-bindings-win32-x64/.npmrc
@@ -1 +1,2 @@
-@jraymakers:registry=https://npm.pkg.github.com
+@duckdb:registry=https://npm.pkg.github.com
+//npm.pkg.github.com/:_authToken=${NPM_AUTH_TOKEN}
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings-win32-x64/README.md b/alt/bindings/pkgs/@duckdb/node-bindings-win32-x64/README.md
@@ -0,0 +1 @@
+# DuckDB Node Bindings: Win32 x64
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings-win32-x64/package.json b/alt/bindings/pkgs/@duckdb/node-bindings-win32-x64/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@jraymakers/duckdb-node-bindings-win32-x64",
-  "version": "0.0.1",
+  "name": "@duckdb/node-bindings-win32-x64",
+  "version": "0.0.2",
   "os": [
     "win32"
   ],
@@ -9,6 +9,6 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/jraymakers/duckdb-node-packages.git"
+    "url": "https://github.com/duckdb/duckdb-node-neo.git"
   }
 }
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings/.npmrc b/alt/bindings/pkgs/@duckdb/node-bindings/.npmrc
@@ -1 +1,2 @@
-@jraymakers:registry=https://npm.pkg.github.com
+@duckdb:registry=https://npm.pkg.github.com
+//npm.pkg.github.com/:_authToken=${NPM_AUTH_TOKEN}
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings/README.md b/alt/bindings/pkgs/@duckdb/node-bindings/README.md
@@ -0,0 +1 @@
+# DuckDB Node Bindings
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings/duckdb.js b/alt/bindings/pkgs/@duckdb/node-bindings/duckdb.js
@@ -1 +1 @@
-module.exports = require(`@jraymakers/duckdb-node-bindings-${process.platform}-${process.arch}/duckdb.node`);
+module.exports = require(`@duckdb/node-bindings-${process.platform}-${process.arch}/duckdb.node`);
diff --git a/alt/bindings/pkgs/@duckdb/node-bindings/package.json b/alt/bindings/pkgs/@duckdb/node-bindings/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "@jraymakers/duckdb-node-bindings",
-  "version": "0.0.1",
+  "name": "@duckdb/node-bindings",
+  "version": "0.0.2",
   "main": "./duckdb.js",
   "types": "./duckdb.d.ts",
   "optionalDependencies": {
-    "@jraymakers/duckdb-node-bindings-darwin-arm64": "workspace:*",
-    "@jraymakers/duckdb-node-bindings-linux-x64": "workspace:*",
-    "@jraymakers/duckdb-node-bindings-win32-x64": "workspace:*"
+    "@duckdb/node-bindings-darwin-arm64": "workspace:*",
+    "@duckdb/node-bindings-linux-x64": "workspace:*",
+    "@duckdb/node-bindings-win32-x64": "workspace:*"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/jraymakers/duckdb-node-packages.git"
+    "url": "https://github.com/duckdb/duckdb-node-neo.git"
   }
 }
diff --git a/alt/bindings/test/config.test.ts b/alt/bindings/test/config.test.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { expect, suite, test } from 'vitest';
 
 suite('config', () => {

diff --git a/alt/bindings/test/enums.test.ts b/alt/bindings/test/enums.test.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { expect, suite, test } from 'vitest';
 
 suite('enums', () => {

diff --git a/alt/bindings/test/errors.test.ts b/alt/bindings/test/errors.test.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { expect, suite, test } from 'vitest';
 
 suite('errors', () => {

diff --git a/alt/bindings/test/functions.test.ts b/alt/bindings/test/functions.test.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { expect, suite, test } from 'vitest';
 
 suite('functions', () => {

diff --git a/alt/bindings/test/logical_type.test.ts b/alt/bindings/test/logical_type.test.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { expect, suite, test } from 'vitest';
 
 suite('logical_type', () => {

diff --git a/alt/bindings/test/open.test.ts b/alt/bindings/test/open.test.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { expect, suite, test } from 'vitest';
 
 suite('open', () => {

diff --git a/alt/bindings/test/query.test.ts b/alt/bindings/test/query.test.ts
@@ -1,4 +1,4 @@
-import duckdb from '@jraymakers/duckdb-node-bindings';
+import duckdb from '@duckdb/node-bindings';
 import { expect, suite, test } from 'vitest';
 
 function isValid(validity: BigUint64Array, bit: number): boolean {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = require(`@jraymakers/duckdb-node-bindings-${process.platform}-${process.arch}/duckdb.node`);
		module.exports = require(`@duckdb/node-bindings-${process.platform}-${process.arch}/duckdb.node`);