1.0.12

fix(core): update
1.0.11
2023-12-03 18:41:44 +01:00 · 2023-12-03 18:41:43 +01:00 · 2023-12-03 18:10:36 +01:00 · 2023-12-03 18:10:35 +01:00 · 2023-12-03 16:35:52 +01:00 · 2023-12-03 16:35:51 +01:00
11 changed files with 3450 additions and 2180 deletions
--- a/.gitea/workflows/default_nottags.yaml
+++ b/.gitea/workflows/default_nottags.yaml
@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
--- a/.gitea/workflows/default_tags.yaml
+++ b/.gitea/workflows/default_tags.yaml
@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @git.zone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true
--- a/npmextra.json
+++ b/npmextra.json
@ -3,10 +3,10 @@
    "projectType": "npm",
    "module": {
      "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
      "gitrepo": "smartjimp",
      "description": "a tool fr working with images in TypeScript",
-      "npmPackagename": "@pushrocks/smartjimp",
+      "npmPackagename": "@push.rocks/smartjimp",
      "license": "MIT",
      "projectDomain": "push.rocks"
    }
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartjimp",
-  "version": "1.0.4",
+  "name": "@push.rocks/smartjimp",
+  "version": "1.0.12",
  "private": false,
  "description": "a tool fr working with images in TypeScript",
  "main": "dist_ts/index.js",
@ -9,24 +9,28 @@
  "license": "MIT",
  "scripts": {
    "test": "(tstest test/)",
-    "build": "(tsbuild)",
+    "build": "(tsbuild --allowimplicitany)",
    "buildDocs": "tsdoc"
  },
  "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tsrun": "^1.2.39",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.11.18"
+    "@git.zone/tsbuild": "^2.1.66",
+    "@git.zone/tsrun": "^1.2.44",
+    "@git.zone/tstest": "^1.0.77",
+    "@push.rocks/tapbundle": "^5.0.8",
+    "@types/node": "^20.10.2"
  },
  "dependencies": {
-    "@pushrocks/levelcache": "^3.0.3",
-    "@pushrocks/smartfile": "^10.0.7",
-    "@pushrocks/smarthash": "^3.0.1",
-    "@pushrocks/smartpath": "^5.0.5",
-    "@pushrocks/smartrequest": "^2.0.11",
-    "@types/sharp": "^0.31.1",
-    "sharp": "^0.31.3"
+    "@img/sharp-darwin-arm64": "^0.33.0",
+    "@img/sharp-darwin-x64": "^0.33.0",
+    "@img/sharp-linux-arm64": "^0.33.0",
+    "@img/sharp-linux-x64": "^0.33.0",
+    "@img/sharp-win32-x64": "^0.33.0",
+    "@push.rocks/levelcache": "^3.0.3",
+    "@push.rocks/smartfile": "^11.0.4",
+    "@push.rocks/smarthash": "^3.0.4",
+    "@push.rocks/smartpath": "^5.0.5",
+    "@push.rocks/smartrequest": "^2.0.15",
+    "sharp": "^0.33.0"
  },
  "files": [
    "ts/**/*",
@ -43,5 +47,13 @@
  "type": "module",
  "browserslist": [
    "last 1 chrome versions"
-  ]
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitlab.com/push.rocks/smartjimp.git"
+  },
+  "bugs": {
+    "url": "https://gitlab.com/push.rocks/smartjimp/issues"
+  },
+  "homepage": "https://gitlab.com/push.rocks/smartjimp#readme"
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/readme.md
+++ b/readme.md
@ -1,8 +1,8 @@
-# @pushrocks/smartjimp
+# @push.rocks/smartjimp
 a tool fr working with images in TypeScript

 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartjimp)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartjimp)
 * [gitlab.com (source)](https://gitlab.com/pushrocks/smartjimp)
 * [github.com (source mirror)](https://github.com/pushrocks/smartjimp)
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartjimp/)
@ -13,14 +13,14 @@ Status Category | Status Badge
 -- | --
 GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartjimp/badges/master/pipeline.svg)](https://lossless.cloud)
 GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartjimp/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartjimp)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartjimp)](https://lossless.cloud)
 Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartjimp)](https://lossless.cloud)
 TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
 node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
 Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
-PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartjimp)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartjimp)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartjimp)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smartjimp)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartjimp)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartjimp)](https://lossless.cloud)

 ## Usage

--- a/test/test.ts
+++ b/test/test.ts
@ -1,6 +1,6 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 import * as smartjimp from '../ts/index.js';
-import * as smartfile from '@pushrocks/smartfile';
+import * as smartfile from '@push.rocks/smartfile';

 let testSmartJimp: smartjimp.SmartJimp;

@ -10,8 +10,9 @@ tap.test('first test', async () => {
 });

 tap.test('should be able to create a master', async () => {
-  const convertedAsset = await testSmartJimp.getFromUrl('https://images.unsplash.com/photo-1673276628202-737bf3020ac2?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3774&q=80', {width: 200});
-  (await smartfile.Smartfile.fromBuffer('.nogit/result.jpeg', convertedAsset)).write();
+  const smartfileInstance = await smartfile.SmartFile.fromUrl('https://images.unsplash.com/photo-1673276628202-737bf3020ac2?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3774&q=80')
+  const convertedAsset = await testSmartJimp.getFromSmartfile(smartfileInstance, {width: 500});
+  (await smartfile.SmartFile.fromBuffer('.nogit/result.avif', convertedAsset)).write();
 });

 tap.start();
--- a/ts/00_commitinfo_data.ts
+++ b/ts/00_commitinfo_data.ts
@ -2,7 +2,7 @@
 * autocreated commitinfo by @pushrocks/commitinfo
 */
 export const commitinfo = {
-  name: '@pushrocks/smartjimp',
-  version: '1.0.4',
+  name: '@push.rocks/smartjimp',
+  version: '1.0.12',
  description: 'a tool fr working with images in TypeScript'
 }
--- a/ts/smartjimp.classes.smartjimp.ts
+++ b/ts/smartjimp.classes.smartjimp.ts
@ -1,6 +1,7 @@
 import * as plugins from './smartjimp.plugins.js';

-export interface IDimensions {
+export interface IAssetVariation {
+  format?: 'avif' | 'webp' | 'png';
  width?: number;
  height?: number;
 }
@ -16,64 +17,40 @@ export class SmartJimp {
   * get a key that is unique for a wanted asset variation
   */
  private getCacheKey(
-    sourceTypeArg: 'path' | 'url' | 'smartfile',
+    sourceTypeArg: 'streamfile' | 'smartfile',
    sourceIdArg: string,
-    wantedDimensionsArg?: IDimensions
+    assetVariationArg?: IAssetVariation
  ) {
    return `${sourceTypeArg}_${sourceIdArg}_${
-      wantedDimensionsArg
-        ? `${wantedDimensionsArg.width || 'auto' }x${wantedDimensionsArg.height || 'auto'}`
+      assetVariationArg
+        ? `${assetVariationArg.width || 'auto' }x${assetVariationArg.height || 'auto'}`
        : 'original'
    }`;
  }

-  private async computeAssetVariation(assetBuffer: Buffer, wantedDimensions?: IDimensions) {
-    if (!wantedDimensions) {
-      return assetBuffer;
+  public async computeAssetVariation(assetBufferArg: Buffer, assetVariationArg?: IAssetVariation) {
+    if (!assetVariationArg) {
+      return assetBufferArg;
    }
-    let sharpImage = plugins.sharp(assetBuffer);
-    sharpImage = sharpImage.resize(wantedDimensions.width, wantedDimensions.height);
-    const result = await sharpImage.resize(wantedDimensions.width, wantedDimensions.height).jpeg().toBuffer();
-    return result;
-  }
-
-  public async getFromPath(pathArg: string, wantedDimensionsArg?: IDimensions) {
-    const cacheKey = this.getCacheKey('path', pathArg, wantedDimensionsArg);
-    const existingCacheEntry = await this.levelCache.retrieveCacheEntryByKey(cacheKey);
-    if (existingCacheEntry) {
-      return existingCacheEntry.contents;
-    } else {
-      const originalAssetSmartfile = await plugins.smartfile.Smartfile.fromFilePath(pathArg);
-      const computedAssetBuffer = await this.computeAssetVariation(originalAssetSmartfile.contentBuffer, wantedDimensionsArg);
-      this.levelCache.storeCacheEntryByKey(cacheKey, new plugins.levelcache.CacheEntry({
-        contents: computedAssetBuffer,
-        ttl: 600000
-      }));
-      return computedAssetBuffer;
-    }
-  }
-
-  public async getFromUrl(urlArg: string, wantedDimensionsArg?: IDimensions) {
-    const cacheKey = this.getCacheKey('url', urlArg, wantedDimensionsArg);
-    const existingCacheEntry = await this.levelCache.retrieveCacheEntryByKey(cacheKey);
-    if (existingCacheEntry) {
-      return existingCacheEntry.contents;
-    } else {
-      const originalAssetBuffer = (await plugins.smartrequest.getBinary(urlArg)).body;
-      const computedAssetBuffer = await this.computeAssetVariation(originalAssetBuffer, wantedDimensionsArg);
-      this.levelCache.storeCacheEntryByKey(cacheKey, new plugins.levelcache.CacheEntry({
-        contents: computedAssetBuffer,
-        ttl: 600000
-      }));
-      return computedAssetBuffer;
+    let sharpImage = plugins.sharp(assetBufferArg);
+    sharpImage = sharpImage.resize(assetVariationArg.width, assetVariationArg.height);
+    const resultResize = sharpImage.resize(assetVariationArg.width, assetVariationArg.height);
+    switch (assetVariationArg.format) {
+      case 'avif':
+        sharpImage = resultResize.avif();
+      case 'webp':
+        sharpImage = resultResize.webp();
+      case 'png':
+        sharpImage = resultResize.png();
    }
+    return sharpImage.toBuffer();
  }

  public async getFromSmartfile(
-    smartfileArg: plugins.smartfile.Smartfile,
-    wantedDimensionsArg?: IDimensions
+    smartfileArg: plugins.smartfile.SmartFile,
+    wantedDimensionsArg?: IAssetVariation
  ) {
-    const cacheKey = this.getCacheKey('url', await smartfileArg.getHash(), wantedDimensionsArg);
+    const cacheKey = this.getCacheKey('smartfile', await smartfileArg.getHash(), wantedDimensionsArg);
    const existingCacheEntry = await this.levelCache.retrieveCacheEntryByKey(cacheKey);
    if (existingCacheEntry) {
      return existingCacheEntry.contents;
@ -86,4 +63,11 @@ export class SmartJimp {
      return computedAssetBuffer;
    }
  }
+
+  public async createAvifImageFromBuffer(bufferArg: Buffer) {
+    const sharpImage = plugins.sharp(bufferArg);
+    const result = await sharpImage.avif().toBuffer();
+    return result;
+  }
+
 }
--- a/ts/smartjimp.plugins.ts
+++ b/ts/smartjimp.plugins.ts
@ -4,11 +4,11 @@ import * as path from 'path';
 export { path };

 // @pushrocks scope
-import * as levelcache from '@pushrocks/levelcache';
-import * as smartfile from '@pushrocks/smartfile';
-import * as smarthash from '@pushrocks/smarthash';
-import * as smartpath from '@pushrocks/smartpath';
-import * as smartrequest from '@pushrocks/smartrequest';
+import * as levelcache from '@push.rocks/levelcache';
+import * as smartfile from '@push.rocks/smartfile';
+import * as smarthash from '@push.rocks/smarthash';
+import * as smartpath from '@push.rocks/smartpath';
+import * as smartrequest from '@push.rocks/smartrequest';

 export { levelcache, smartpath, smarthash, smartfile, smartrequest };

--- a/tsconfig.json
+++ b/tsconfig.json
@ -3,8 +3,12 @@
    "experimentalDecorators": true,
    "useDefineForClassFields": false,
    "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "nodenext",
-    "esModuleInterop": true
-  }
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }
Author	SHA1	Message	Date
Philipp Kunz	063905bfaa	1.0.12	2023-12-03 18:41:44 +01:00
Philipp Kunz	f1ad45289a	fix(core): update	2023-12-03 18:41:43 +01:00
Philipp Kunz	193e174fd7	1.0.11	2023-12-03 18:10:36 +01:00
Philipp Kunz	703d21c426	fix(core): update	2023-12-03 18:10:35 +01:00
Philipp Kunz	2d83ebac4d	1.0.10	2023-12-03 16:35:52 +01:00
Philipp Kunz	7454a52d03	fix(core): update	2023-12-03 16:35:51 +01:00
Philipp Kunz	1e93429186	1.0.9	2023-12-03 16:32:53 +01:00
Philipp Kunz	ee926e18a7	fix(core): update	2023-12-03 16:32:52 +01:00
Philipp Kunz	02a6656869	1.0.8	2023-11-24 20:21:13 +01:00
Philipp Kunz	b07aba76e9	fix(core): update	2023-11-24 20:21:12 +01:00
Philipp Kunz	7fdeed160a	1.0.7	2023-11-24 20:09:24 +01:00
Philipp Kunz	c6cd1dc38f	fix(core): update	2023-11-24 20:09:23 +01:00
Philipp Kunz	d2a47f403e	1.0.6	2023-11-24 20:08:49 +01:00
Philipp Kunz	c8ab607959	fix(core): update	2023-11-24 20:08:48 +01:00
Philipp Kunz	8170877c55	switch to new org scheme	2023-07-11 00:51:43 +02:00
Philipp Kunz	99182bdb69	switch to new org scheme	2023-07-10 02:56:32 +02:00
Philipp Kunz	d1393c5128	1.0.5	2023-01-09 18:19:51 +01:00
Philipp Kunz	fc92f0f3e8	fix(core): update	2023-01-09 18:19:50 +01:00