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: compile tzcode so it is in sync with tzdata #2107

Merged
merged 6 commits into from
Sep 17, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,20 @@ http_archive(
urls = ["https://data.iana.org/time-zones/releases/tzdata2020a.tar.gz"],
)

load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
http_archive(
name = "tzcode",
build_file = "@//:packages/intl-datetimeformat/tzcode.BUILD",
sha256 = "7d2af7120ee03df71fbca24031ccaf42404752e639196fe93c79a41b38a6d669",
urls = ["https://data.iana.org/time-zones/releases/tzcode2020a.tar.gz"],
)

load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")

node_repositories(
node_version = "14.9.0",
package_json = ["//:package.json"],
yarn_version = "1.22.4",
)

# node_repositories(
# node_version = "14.5.0",
Expand Down
22 changes: 13 additions & 9 deletions packages/intl-datetimeformat/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,9 @@ generate_src_file(
src = "src/data/all-tz.ts",
args = [
"$(execpath scripts/process-zdump.ts)",
"--input",
"$(location @tzdata//:all.zdump)",
"--output",
"$@",
"$(locations @tzdata//:zdumps)",
],
data = [
"scripts/process-zdump.ts",
Expand All @@ -214,11 +213,13 @@ generate_src_file(
"//packages/ecma402-abstract:dist",
"//packages/ecma402-abstract:types",
"@npm//@types/fs-extra",
"@npm//@types/json-stable-stringify",
"@npm//@types/minimist",
"@npm//@types/node",
"@npm//fs-extra",
"@npm//json-stable-stringify",
"@npm//minimist",
"@tzdata//:all.zdump",
"@tzdata//:zdumps",
],
)

Expand All @@ -230,10 +231,9 @@ ts_node(
args = [
"$(execpath scripts/process-zdump.ts)",
"--polyfill",
"--input",
"$(location @tzdata//:all.zdump)",
"--output",
"$@",
"$(locations @tzdata//:zdumps)",
],
data = [
"scripts/process-zdump.ts",
Expand All @@ -243,11 +243,13 @@ ts_node(
"//packages/ecma402-abstract:dist",
"//packages/ecma402-abstract:types",
"@npm//@types/fs-extra",
"@npm//@types/json-stable-stringify",
"@npm//@types/minimist",
"@npm//@types/node",
"@npm//fs-extra",
"@npm//json-stable-stringify",
"@npm//minimist",
"@tzdata//:all.zdump",
"@tzdata//:zdumps",
],
)

Expand All @@ -259,10 +261,9 @@ ts_node(
"$(execpath scripts/process-zdump.ts)",
"--golden",
"--polyfill",
"--input",
"$(location @tzdata//:all.zdump)",
"--output",
"$@",
"$(locations @tzdata//:zdumps)",
],
data = [
"scripts/process-zdump.ts",
Expand All @@ -272,11 +273,13 @@ ts_node(
"//packages/ecma402-abstract:dist",
"//packages/ecma402-abstract:types",
"@npm//@types/fs-extra",
"@npm//@types/json-stable-stringify",
"@npm//@types/minimist",
"@npm//@types/node",
"@npm//fs-extra",
"@npm//json-stable-stringify",
"@npm//minimist",
"@tzdata//:all.zdump",
"@tzdata//:zdumps",
],
)

Expand Down Expand Up @@ -376,6 +379,7 @@ prettier_check(
exclude = [
"BUILD",
"tzdata.BUILD",
"tzcode.BUILD",
"CHANGELOG.md",
"tests/locale-data/*",
"src/data/*",
Expand Down
49 changes: 34 additions & 15 deletions packages/intl-datetimeformat/scripts/process-zdump.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import minimist from 'minimist';
import {execFile as _execFile} from 'child_process';
import {readFileSync} from 'fs';
import {readFile as _readFile} from 'fs';
import {promisify} from 'util';
import {outputFileSync} from 'fs-extra';
import {UnpackedData, ZoneData} from '../src/types';
import {pack} from '../src/packer';
import stringify from 'json-stable-stringify';

const readFile = promisify(_readFile);
const SPACE_REGEX = /[\s\t]+/;

const MONTHS = [
Expand Down Expand Up @@ -295,21 +298,14 @@ function utTimeToSeconds(utTime: string) {
);
}

const LINE_REGEX = /^(.*?)\s+(.*?) UT = (.*?) isdst=(0|1) gmtoff=(.*?)$/i;
const LINE_REGEX = /^(.*?)\s+(.*?) UTC? = (.*?) isdst=(0|1) gmtoff=(.*?)$/i;

async function main(args: minimist.ParsedArgs) {
const {input, polyfill, output, golden} = args;
const content = readFileSync(input, 'utf8');
const zones: Record<string, ZoneData[]> = {};
function processZone(
content: string,
{zones, abbrvs, offsets}: UnpackedData,
golden?: string
) {
const lines = content.split('\n');
const abbrvs: string[] = [];
const offsets: number[] = [];
const data: UnpackedData = {
zones,
abbrvs,
offsets,
};

for (const line of lines) {
if (line.endsWith('NULL')) {
continue;
Expand Down Expand Up @@ -349,6 +345,27 @@ async function main(args: minimist.ParsedArgs) {
}
}
}
}

async function main(args: minimist.ParsedArgs) {
const {_: files, polyfill, output, golden} = args;
const inputs = files.slice(2);
inputs.sort(); // sort so result is stable

const zones: Record<string, ZoneData[]> = {};
const abbrvs: string[] = [];
const offsets: number[] = [];
const data: UnpackedData = {
zones,
abbrvs,
offsets,
};

const contents = await Promise.all(
inputs.map((input: string) => readFile(input, 'utf8'))
);

processZone(contents.join('\n'), data, golden);

if (polyfill) {
outputFileSync(
Expand All @@ -364,7 +381,9 @@ if ('DateTimeFormat' in Intl && Intl.DateTimeFormat.__addTZData) {
output,
`// @generated
// prettier-ignore
export default ${JSON.stringify(pack(data), undefined, 2)}`
export default ${stringify(pack(data), {
space: 2,
})}`
);
}
}
Expand Down