Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: upgrade to linzjs/style 5.1.0 #1223

Merged
merged 1 commit into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"license": "ISC",
"description": "",
"devDependencies": {
"@linzjs/style": "^4.2.0",
"@linzjs/style": "^5.1.0",
"@types/node": "^20.0.0",
"lerna": "^7.1.4",
"rimraf": "^4.1.2"
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/bin.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// Ensure connection reuse is enabled
process.env['AWS_NODEJS_CONNECTION_REUSE_ENABLED'] = '1';

import { otError } from '@linzjs/tracing';
import { run } from 'cmd-ts';

import { cmd } from './index.js';
import { logger } from './log.js';
import { otError } from '@linzjs/tracing';

run(cmd, process.argv.slice(2)).catch((err) => {
logger.fatal('Command:Failed', { ...otError(err) });
Expand Down
8 changes: 5 additions & 3 deletions packages/cli/src/commands/dump.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { promises as fs } from 'node:fs';
import { basename } from 'node:path';
import { pathToFileURL } from 'node:url';

import { fsa } from '@chunkd/fs';
import { CogTiff, TiffMimeType } from '@cogeotiff/core';
import { log } from '@linzjs/tracing';
import { command, number, option, optional, restPositionals } from 'cmd-ts';
import { promises as fs } from 'node:fs';
import { basename } from 'node:path';
import { pathToFileURL } from 'node:url';
import pLimit from 'p-limit';

import { DefaultArgs, Url } from '../common.js';
import { ensureS3fs, setupLogger } from '../log.js';
import { getTileName, writeTile } from '../util.tile.js';
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/commands/info.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { fsa } from '@chunkd/fs';
import { CogTiff, Tag, TiffTagGeo, TiffTag, TiffTagValueType, TiffVersion, toHex, TagOffset } from '@cogeotiff/core';
import { CogTiff, Tag, TagOffset, TiffTag, TiffTagGeo, TiffTagValueType, TiffVersion, toHex } from '@cogeotiff/core';
import { CogTiffImage } from '@cogeotiff/core/src/cog.tiff.image.js';
import c from 'ansi-colors';
import { command, flag, option, optional, restPositionals } from 'cmd-ts';

import { ActionUtil, CliResultMap } from '../action.util.js';
import { CliTable } from '../cli.table.js';
import { DefaultArgs, Url } from '../common.js';
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/common.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Type, flag } from 'cmd-ts';
import { flag, Type } from 'cmd-ts';
import { pathToFileURL } from 'url';

export const verbose = flag({ long: 'verbose', description: 'Verbose logging', short: 'v' });
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/fs.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { SourceCallback, SourceMiddleware, SourceRequest } from '@chunkd/source';

import { logger } from './log.js';

export const FetchLog: SourceMiddleware & { reset(): void; fetches: SourceRequest[]; bytesRead: number } = {
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { subcommands } from 'cmd-ts';
import { commandInfo } from './commands/info.js';

import { commandDump } from './commands/dump.js';
import { commandInfo } from './commands/info.js';

export const cmd = subcommands({
name: 'cogeotiff',
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/log.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { FsHttp, fsa } from '@chunkd/fs';
import { fsa, FsHttp } from '@chunkd/fs';
import { SourceCache, SourceChunk } from '@chunkd/middleware';
import { log } from '@linzjs/tracing';

import { FetchLog } from './fs.js';

// Cache the last 10MB of chunks for reuse
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/util.tile.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { promises as fs } from 'node:fs';

import { CogTiff, TiffMimeType } from '@cogeotiff/core';
import { log } from '@linzjs/tracing';
import { promises as fs } from 'node:fs';

const FileExtension: Record<string, string> = {
[TiffMimeType.Jpeg]: 'jpeg',
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/__benchmark__/cog.read.benchmark.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { readFile } from 'fs/promises';

import { CogTiff } from '../cog.tiff.js';
import { SourceMemory } from './source.memory.js';
import { TiffTag } from '../index.js';
import { SourceMemory } from './source.memory.js';

// console.log = console.trace;
/** Read a tile from every image inside of a tiff 300 tiles read */
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/__benchmark__/source.file.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { readFile, stat } from 'node:fs/promises';
import { gunzip } from 'node:zlib';
import { promisify } from 'node:util';
import { gunzip } from 'node:zlib';

import { Source } from '../source.js';

const gunzipP = promisify(gunzip);
Expand Down
6 changes: 4 additions & 2 deletions packages/core/src/__test__/cog.image.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { promises as fs } from 'fs';
import assert from 'node:assert';
import { beforeEach, describe, it } from 'node:test';

import { promises as fs } from 'fs';

import { TestFileSource } from '../__benchmark__/source.file.js';
import { SourceMemory } from '../__benchmark__/source.memory.js';
import { ByteSize } from '../util/bytes.js';
import { CogTiff } from '../cog.tiff.js';
import { TiffMimeType } from '../const/tiff.mime.js';
import { ByteSize } from '../util/bytes.js';

// 900913 properties.
const A = 6378137.0;
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/__test__/cog.read.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import assert from 'node:assert';
import { describe, it } from 'node:test';

import { TestFileSource } from '../__benchmark__/source.file.js';
import { CogTiff } from '../cog.tiff.js';
import { TiffMimeType } from '../const/tiff.mime.js';
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/__test__/example.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { SourceHttp } from '@chunkd/source-http';

import { CogTiff } from '../index.js';

async function main(): Promise<void> {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/cog.tiff.image.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { getUint } from './util/bytes.js';
import { CogTiff } from './cog.tiff.js';
import { TiffCompression, TiffMimeType } from './const/tiff.mime.js';
import { TiffTag, TiffTagGeo } from './const/tiff.tag.id.js';
import { fetchAllOffsets, fetchLazy, getValueAt } from './read/tiff.tag.factory.js';
import { Tag, TagInline, TagOffset } from './read/tiff.tag.js';
import { getUint } from './util/bytes.js';
import { BoundingBox, Size } from './vector.js';
import { fetchAllOffsets, fetchLazy, getValueAt } from './read/tiff.tag.factory.js';

/** Invalid EPSG code */
export const InvalidProjectionCode = 32767;
Expand Down Expand Up @@ -152,7 +152,7 @@ export class CogTiffImage {
this.tagsGeo.set(key, tag.value.slice(offset, offset + count - 1).trim());
} else if (Array.isArray(tag.value)) {
if (count === 1) this.tagsGeo.set(key, tag.value[offset]);
else this.tagsGeo.set(key, tag.value.slice(offset, offset + count) as any);
else this.tagsGeo.set(key, tag.value.slice(offset, offset + count) as unknown as number);
} else {
throw new Error('Failed to extract GeoTiffTags');
}
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
export { CogTiff } from './cog.tiff.js';
export { CogTiffImage } from './cog.tiff.image.js';
export { CogTiff } from './cog.tiff.js';
export { TiffEndian } from './const/tiff.endian.js';
export { TiffCompression, TiffMimeType } from './const/tiff.mime.js';
export { TiffTagGeo, TiffTag } from './const/tiff.tag.id.js';
export { TiffTag, TiffTagGeo } from './const/tiff.tag.id.js';
export { TiffTagValueType } from './const/tiff.tag.value.js';
export { TiffVersion } from './const/tiff.version.js';
export { TagInline, TagLazy, TagOffset, Tag } from './read/tiff.tag.js';
export { Tag, TagInline, TagLazy, TagOffset } from './read/tiff.tag.js';
export { getTiffTagSize } from './read/tiff.value.reader.js';
export { Source } from './source.js';
export { toHex } from './util/util.hex.js';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/read/tiff.ifd.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ByteSize } from '../util/bytes.js';
import { TiffVersion } from '../const/tiff.version.js';
import { ByteSize } from '../util/bytes.js';

export const TagTiffConfig: TiffIfdConfig = {
version: TiffVersion.Tiff,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/read/tiff.value.reader.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ByteSize } from '../util/bytes.js';
import { TiffTagValueType } from '../const/tiff.tag.value.js';
import { ByteSize } from '../util/bytes.js';

export function getTiffTagSize(fieldType: TiffTagValueType): ByteSize {
switch (fieldType) {
Expand Down
6 changes: 5 additions & 1 deletion packages/core/src/util/bytes.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
export enum ByteSize {
export enum ByteSizeFloat {
Double = 8,
Float32 = 4,
}

export enum ByteSize {
UInt64 = 8,
UInt32 = 4,
UInt16 = 2,
UInt8 = 1,
}

/** Shifting `<< 32` does not work in javascript */
const POW_32 = 2 ** 32;
/**
Expand Down
5 changes: 3 additions & 2 deletions packages/examples/src/browser/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { SourceHttp } from '@chunkd/source-http';
import { SourceRequest, SourceMiddleware, SourceCallback, SourceView } from '@chunkd/source';
import { SourceCache, SourceChunk } from '@chunkd/middleware';
import { SourceCallback, SourceMiddleware, SourceRequest, SourceView } from '@chunkd/source';
import { SourceHttp } from '@chunkd/source-http';
import { CogTiff } from '@cogeotiff/core';

import { loadSingleTile } from './example.single.tile';

// Cache all requests to cogs
Expand Down
Loading
Loading